From 40404ebef2b3f24843e5769ae06fb31a775ea937 Mon Sep 17 00:00:00 2001 From: ganglyu Date: Mon, 14 Nov 2022 10:03:48 +0800 Subject: [PATCH 1/4] Upgrade pipeline to use bullseye. --- azure-pipelines.yml | 39 ++++++++++++--------------------------- 1 file changed, 12 insertions(+), 27 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 39acf6fb..7c9a4c43 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -40,7 +40,7 @@ stages: DIFF_COVER_WORKING_DIRECTORY: $(System.DefaultWorkingDirectory)/sonic-gnmi container: - image: sonicdev-microsoft.azurecr.io:443/sonic-slave-buster:latest + image: sonicdev-microsoft.azurecr.io:443/sonic-slave-bullseye:latest steps: - checkout: self @@ -87,47 +87,32 @@ stages: sudo service redis-server start # LIBYANG - sudo dpkg -i ../target/debs/buster/libyang*1.0.73*.deb + sudo dpkg -i ../target/debs/bullseye/libyang*1.0.73*.deb displayName: "Install dependency" - script: | # LIBSWSSCOMMON sudo apt-get -y purge libhiredis-dev libnl-3-dev libnl-route-3-dev - sudo dpkg -i ../target/debs/buster/libnl-3-200_*.deb - sudo dpkg -i ../target/debs/buster/libnl-genl-3-200_*.deb - sudo dpkg -i ../target/debs/buster/libnl-route-3-200_*.deb - sudo dpkg -i ../target/debs/buster/libnl-nf-3-200_*.deb - sudo dpkg -i ../target/debs/buster/libhiredis0.14_*.deb + sudo dpkg -i ../target/debs/bullseye/libnl-3-200_*.deb + sudo dpkg -i ../target/debs/bullseye/libnl-genl-3-200_*.deb + sudo dpkg -i ../target/debs/bullseye/libnl-route-3-200_*.deb + sudo dpkg -i ../target/debs/bullseye/libnl-nf-3-200_*.deb + sudo dpkg -i ../target/debs/bullseye/libhiredis0.14_*.deb + sudo dpkg -i ../target/debs/bullseye/libhiredis-dev_*.deb + sudo dpkg -i ../target/debs/bullseye/libswsscommon_1.0.0_amd64.deb + sudo dpkg -i ../target/debs/bullseye/libswsscommon-dev_1.0.0_amd64.deb + sudo dpkg -i ../target/debs/bullseye/python3-swsscommon_1.0.0_amd64.deb displayName: "Install libswsscommon 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/10/prod + 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" - - task: DownloadPipelineArtifact@2 - inputs: - source: specific - project: build - pipeline: Azure.sonic-swss-common - artifact: sonic-swss-common - runVersion: 'latestFromBranch' - runBranch: 'refs/heads/master' - displayName: "Download sonic-swss-common" - - - script: | - set -ex - # LIBSWSSCOMMON - sudo dpkg -i libswsscommon_1.0.0_amd64.deb - sudo dpkg -i libswsscommon-dev_1.0.0_amd64.deb - sudo dpkg -i python3-swsscommon_1.0.0_amd64.deb - workingDirectory: $(Pipeline.Workspace)/ - displayName: 'Install libswsscommon package' - - script: | set -ex ls -l From cc417ca678e7dee153f3fac1ddaa577e1806b4f6 Mon Sep 17 00:00:00 2001 From: ganglyu Date: Mon, 14 Nov 2022 13:34:30 +0800 Subject: [PATCH 2/4] Download artifact from sonic-swss-common --- azure-pipelines.yml | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 7c9a4c43..f662fdc1 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -99,9 +99,6 @@ stages: sudo dpkg -i ../target/debs/bullseye/libnl-nf-3-200_*.deb sudo dpkg -i ../target/debs/bullseye/libhiredis0.14_*.deb sudo dpkg -i ../target/debs/bullseye/libhiredis-dev_*.deb - sudo dpkg -i ../target/debs/bullseye/libswsscommon_1.0.0_amd64.deb - sudo dpkg -i ../target/debs/bullseye/libswsscommon-dev_1.0.0_amd64.deb - sudo dpkg -i ../target/debs/bullseye/python3-swsscommon_1.0.0_amd64.deb displayName: "Install libswsscommon dependencies" - script: | @@ -113,6 +110,25 @@ stages: sudo apt-get install -y dotnet-sdk-5.0 displayName: "Install .NET CORE" + - task: DownloadPipelineArtifact@2 + inputs: + source: specific + project: build + pipeline: Azure.sonic-swss-common + artifact: sonic-swss-common.bullseye.amd64 + runVersion: 'latestFromBranch' + runBranch: 'refs/heads/master' + displayName: "Download sonic-swss-common" + + - script: | + set -ex + # LIBSWSSCOMMON + sudo dpkg -i libswsscommon_1.0.0_amd64.deb + sudo dpkg -i libswsscommon-dev_1.0.0_amd64.deb + sudo dpkg -i python3-swsscommon_1.0.0_amd64.deb + workingDirectory: $(Pipeline.Workspace)/ + displayName: 'Install libswsscommon package' + - script: | set -ex ls -l From 005d9cbe5d8323f8519ae8e835593e6b7afcaacb Mon Sep 17 00:00:00 2001 From: ganglyu Date: Mon, 14 Nov 2022 13:47:10 +0800 Subject: [PATCH 3/4] test install libyang1 --- azure-pipelines.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index f662fdc1..06475b1d 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -123,6 +123,7 @@ stages: - script: | set -ex # LIBSWSSCOMMON + sudo apt-get install -y libyang1 sudo dpkg -i libswsscommon_1.0.0_amd64.deb sudo dpkg -i libswsscommon-dev_1.0.0_amd64.deb sudo dpkg -i python3-swsscommon_1.0.0_amd64.deb From c6840670e4651cddc824d8aa29f4d0794a10c7b6 Mon Sep 17 00:00:00 2001 From: ganglyu Date: Mon, 14 Nov 2022 14:05:34 +0800 Subject: [PATCH 4/4] Remove debug line --- azure-pipelines.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 06475b1d..f662fdc1 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -123,7 +123,6 @@ stages: - script: | set -ex # LIBSWSSCOMMON - sudo apt-get install -y libyang1 sudo dpkg -i libswsscommon_1.0.0_amd64.deb sudo dpkg -i libswsscommon-dev_1.0.0_amd64.deb sudo dpkg -i python3-swsscommon_1.0.0_amd64.deb