From 8bbda02eba2fe57784db912dfe10f60d495e08c7 Mon Sep 17 00:00:00 2001
From: Shilong Liu <shilongliu@microsoft.com>
Date: Wed, 4 Dec 2024 22:47:43 +0800
Subject: [PATCH 1/2] [ci] Fix pipeline issue caused by dist upgrade

---
 azure-pipelines.yml | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 46d1469..ff8866d 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -10,7 +10,7 @@ trigger:
 
 parameters:
 - name: dist
-  default: bullseye
+  default: bookworm
 
 variables:
   DIFF_COVER_CHECK_THRESHOLD: 80
@@ -18,17 +18,17 @@ variables:
   DIFF_COVER_WORKING_DIRECTORY: $(System.DefaultWorkingDirectory)
 
 pool:
-  vmImage: 'ubuntu-20.04'
+  vmImage: 'ubuntu-24.04'
 
 container:
-  image: sonicdev-microsoft.azurecr.io:443/sonic-slave-bullseye:master
+  image: sonicdev-microsoft.azurecr.io:443/sonic-slave-bookworm:master
 
 steps:
 - task: DownloadPipelineArtifact@2
   inputs:
     source: specific
     project: build
-    pipeline: 1
+    pipeline: 142
     artifact: sonic-buildimage.vs
     runVersion: 'latestFromBranch'
     runBranch: 'refs/heads/master'
@@ -40,7 +40,7 @@ steps:
 - script: |
     set -xe
     sudo apt-get -y purge libhiredis-dev libnl-3-dev libnl-route-3-dev
-    sudo apt install -y libhiredis0.14
+    sudo apt install -y libhiredis0.14 dotnet-sdk-8.0
     sudo dpkg -i libnl-3-200_*.deb
     sudo dpkg -i libnl-genl-3-200_*.deb
     sudo dpkg -i libnl-route-3-200_*.deb
@@ -58,16 +58,6 @@ steps:
   workingDirectory: $(Pipeline.Workspace)/target/python-wheels/${{ parameters.dist }}/
   displayName: 'Install Python dependencies'
 
-- script: |
-    set -ex
-    # Install .NET CORE
-    curl -sSL https://packages.microsoft.com/keys/microsoft.asc | sudo apt-key add -
-    sudo apt-add-repository https://packages.microsoft.com/debian/11/prod
-    sudo apt-get update
-    sudo apt-get install -y dotnet-sdk-5.0
-  displayName: "Install .NET CORE"
-
-
 # Python 3
 - script: |
     python3 setup.py test

From 3e07f217aae76e28428b0f031de26c020e906b60 Mon Sep 17 00:00:00 2001
From: Shilong Liu <shilongliu@microsoft.com>
Date: Wed, 4 Dec 2024 23:38:38 +0800
Subject: [PATCH 2/2] fix

---
 azure-pipelines.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index ff8866d..f79f43f 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -40,6 +40,10 @@ steps:
 - script: |
     set -xe
     sudo apt-get -y purge libhiredis-dev libnl-3-dev libnl-route-3-dev
+    wget https://packages.microsoft.com/config/debian/12/packages-microsoft-prod.deb -O packages-microsoft-prod.deb
+    sudo dpkg -i packages-microsoft-prod.deb
+    rm packages-microsoft-prod.deb
+    sudo apt update
     sudo apt install -y libhiredis0.14 dotnet-sdk-8.0
     sudo dpkg -i libnl-3-200_*.deb
     sudo dpkg -i libnl-genl-3-200_*.deb