Skip to content

Commit e262775

Browse files
Update swss pipeline to use ubuntu 22.04 agent pool (#3656)
* Update swss pipeline to use ubuntu 22.04 agent pool
1 parent 8c2b2ac commit e262775

File tree

4 files changed

+26
-18
lines changed

4 files changed

+26
-18
lines changed

.azure-pipelines/build-docker-sonic-vs-template.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ jobs:
7272
timeoutInMinutes: ${{ parameters.timeout }}
7373

7474
pool:
75-
vmImage: 'ubuntu-20.04'
75+
vmImage: 'ubuntu-22.04'
7676

7777
steps:
7878
- task: DownloadPipelineArtifact@2

.azure-pipelines/build-template.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ jobs:
8888
${{ if ne(parameters.pool, 'default') }}:
8989
name: ${{ parameters.pool }}
9090
${{ else }}:
91-
vmImage: 'ubuntu-20.04'
91+
vmImage: 'ubuntu-22.04'
9292

9393
container:
9494
image: sonicdev-microsoft.azurecr.io:443/${{ parameters.sonic_slave }}:latest

.azure-pipelines/gcov.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
${{ if ne(parameters.pool, 'default') }}:
4545
name: ${{ parameters.pool }}
4646
${{ if eq(parameters.pool, 'default') }}:
47-
vmImage: 'ubuntu-20.04'
47+
vmImage: 'ubuntu-22.04'
4848

4949
variables:
5050
DIFF_COVER_CHECK_THRESHOLD: 80

.azure-pipelines/test-docker-sonic-vs-template.yml

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ parameters:
2424
type: string
2525
default: '$(BUILD_BRANCH)'
2626

27-
- name: sonic_buildimage_ubuntu20_04
27+
- name: sonic_buildimage_ubuntu22_04
2828
type: string
2929
default: '$(BUILD_BRANCH)'
3030

@@ -68,7 +68,7 @@ jobs:
6868
source: specific
6969
project: build
7070
pipeline: Azure.sonic-swss-common
71-
artifact: sonic-swss-common.amd64.ubuntu20_04
71+
artifact: sonic-swss-common.amd64.ubuntu22_04
7272
runVersion: 'latestFromBranch'
7373
runBranch: 'refs/heads/${{ parameters.swss_common_branch }}'
7474
path: $(Build.ArtifactStagingDirectory)/download
@@ -77,18 +77,18 @@ jobs:
7777
inputs:
7878
source: specific
7979
project: build
80-
pipeline: sonic-net.sonic-buildimage-ubuntu20.04
81-
artifact: sonic-buildimage.amd64.ubuntu20_04
80+
pipeline: sonic-net.sonic-buildimage-ubuntu22.04
81+
artifact: sonic-buildimage.amd64.ubuntu22_04
8282
runVersion: 'latestFromBranch'
83-
runBranch: 'refs/heads/${{ parameters.sonic_buildimage_ubuntu20_04 }}'
83+
runBranch: 'refs/heads/${{ parameters.sonic_buildimage_ubuntu22_04 }}'
8484
path: $(Build.ArtifactStagingDirectory)/download
85-
displayName: "Download sonic buildimage ubuntu20.04 deb packages"
85+
displayName: "Download sonic buildimage ubuntu22.04 deb packages"
8686

8787
- script: |
8888
set -ex
8989
# Install .NET CORE
9090
curl -sSL https://packages.microsoft.com/keys/microsoft.asc | sudo apt-key add -
91-
sudo apt-add-repository https://packages.microsoft.com/ubuntu/20.04/prod
91+
sudo apt-add-repository https://packages.microsoft.com/ubuntu/22.04/prod
9292
sudo apt-get update
9393
sudo apt-get install -y dotnet-sdk-8.0
9494
sudo dotnet tool install dotnet-reportgenerator-globaltool --tool-path /usr/bin 2>&1 | tee log.log || grep 'already installed' log.log
@@ -97,19 +97,27 @@ jobs:
9797
9898
- script: |
9999
set -ex
100+
# install packages for vs test
101+
sudo pip3 install pytest flaky exabgp docker redis lcov_cobertura
102+
103+
# install other dependencies
104+
sudo apt-get -o DPkg::Lock::Timeout=600 install -y net-tools \
105+
bridge-utils \
106+
vlan \
107+
libzmq3-dev \
108+
libzmq5 \
109+
libboost-serialization1.74.0 \
110+
libboost1.74-dev \
111+
libboost-dev \
112+
libhiredis0.14 \
113+
libyang-dev \
114+
100115
sudo .azure-pipelines/build_and_install_module.sh
101116
102-
sudo apt-get install -y libhiredis0.14 libyang0.16
103-
sudo dpkg -i $(Build.ArtifactStagingDirectory)/download/libprotobuf*_amd64.deb $(Build.ArtifactStagingDirectory)/download/libprotobuf-lite*_amd64.deb $(Build.ArtifactStagingDirectory)/download/python3-protobuf*_amd64.deb
117+
sudo dpkg -i $(Build.ArtifactStagingDirectory)/download/libprotobuf*_amd64.deb $(Build.ArtifactStagingDirectory)/download/libprotobuf-lite*_amd64.deb $(Build.ArtifactStagingDirectory)/download/python3-protobuf*_amd64.deb
104118
sudo dpkg -i $(Build.ArtifactStagingDirectory)/download/libdashapi*.deb
105119
sudo dpkg -i --force-confask,confnew $(Build.ArtifactStagingDirectory)/download/libswsscommon_1.0.0_amd64.deb || apt-get install -f
106120
sudo dpkg -i $(Build.ArtifactStagingDirectory)/download/python3-swsscommon_1.0.0_amd64.deb
107-
108-
# install packages for vs test
109-
sudo apt-get install -y net-tools bridge-utils vlan
110-
sudo apt-get install -y python3-pip
111-
sudo pip3 install pytest==4.6.2 attrs==19.1.0 exabgp==4.0.10 distro==1.5.0 docker>=4.4.1 redis==3.3.4 flaky==3.7.0 requests==2.31.0
112-
sudo pip3 install lcov_cobertura
113121
displayName: "Install dependencies"
114122
115123
- script: |

0 commit comments

Comments
 (0)