Skip to content
2 changes: 1 addition & 1 deletion .azure-pipelines/build-docker-sonic-vs-template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
timeoutInMinutes: ${{ parameters.timeout }}

pool:
vmImage: 'ubuntu-20.04'
vmImage: 'ubuntu-22.04'

steps:
- checkout: self
Expand Down
5 changes: 3 additions & 2 deletions .azure-pipelines/build-sairedis-template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ parameters:
- name: pool
type: string
values:
- sonicbld
- sonicso1ES-amd64
- default
default: default

Expand Down Expand Up @@ -46,7 +46,7 @@ jobs:
${{ if ne(parameters.pool, 'default') }}:
name: ${{ parameters.pool }}
${{ else }}:
vmImage: 'ubuntu-20.04'
vmImage: 'ubuntu-22.04'

container:
image: sonicdev-microsoft.azurecr.io:443/${{ parameters.sonic_slave }}
Expand All @@ -64,6 +64,7 @@ jobs:
displayName: Set up sonic-sairedis branch
- script: |
set -ex
sudo sed -i '/bullseye-backports/d' /etc/apt/sources.list
sudo apt-get update
sudo apt-get install -qq -y \
qtbase5-dev \
Expand Down
5 changes: 3 additions & 2 deletions .azure-pipelines/build-swss-template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ parameters:
- name: pool
type: string
values:
- sonicbld
- sonicso1ES-amd64
- default
default: default

Expand Down Expand Up @@ -42,7 +42,7 @@ jobs:
${{ if ne(parameters.pool, 'default') }}:
name: ${{ parameters.pool }}
${{ else }}:
vmImage: 'ubuntu-20.04'
vmImage: 'ubuntu-22.04'

container:
image: sonicdev-microsoft.azurecr.io:443/${{ parameters.sonic_slave }}
Expand All @@ -59,6 +59,7 @@ jobs:
displayName: Set up sonic-swss branch
- script: |
set -ex
sudo sed -i '/bullseye-backports/d' /etc/apt/sources.list
sudo apt-get update
sudo apt-get install -y libhiredis0.14 libhiredis-dev
sudo apt-get install -y libzmq5 libzmq3-dev
Expand Down
9 changes: 5 additions & 4 deletions .azure-pipelines/build-template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ parameters:
- name: pool
type: string
values:
- sonicbld
- sonicbld-arm64
- sonicbld-armhf
- sonicso1ES-amd64
- sonicso1ES-arm64
- sonicso1ES-armhf
- default
default: default

Expand Down Expand Up @@ -50,7 +50,7 @@ jobs:
${{ if ne(parameters.pool, 'default') }}:
name: ${{ parameters.pool }}
${{ else }}:
vmImage: 'ubuntu-20.04'
vmImage: 'ubuntu-22.04'

container:
image: sonicdev-microsoft.azurecr.io:443/${{ parameters.sonic_slave }}
Expand All @@ -60,6 +60,7 @@ jobs:
clean: true
- script: |
set -ex
sudo sed -i '/bullseye-backports/d' /etc/apt/sources.list
sudo apt-get update
sudo apt-get install -qq -y \
libhiredis-dev \
Expand Down
47 changes: 32 additions & 15 deletions .azure-pipelines/test-docker-sonic-vs-template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ parameters:
- name: log_artifact_name
type: string

- name: sonic_buildimage_ubuntu20_04
- name: sonic_buildimage_ubuntu22_04
type: string
default: '$(BUILD_BRANCH)'

Expand All @@ -15,7 +15,7 @@ jobs:
displayName: vstest
timeoutInMinutes: ${{ parameters.timeout }}

pool: sonic-common
pool: sonictest

steps:
- checkout: self
Expand All @@ -36,35 +36,52 @@ jobs:
displayName: "Download pre-stage built docker-sonic-vs"
- task: DownloadPipelineArtifact@2
inputs:
artifact: sonic-swss-common.amd64.ubuntu20_04
artifact: sonic-swss-common.amd64.ubuntu22_04
path: $(Build.ArtifactStagingDirectory)/download
displayName: "Download pre-stage built sonic-swss-common.amd64.ubuntu20_04"
displayName: "Download pre-stage built sonic-swss-common.amd64.ubuntu22_04"
- task: DownloadPipelineArtifact@2
inputs:
source: specific
project: build
pipeline: sonic-net.sonic-buildimage-ubuntu20.04
artifact: sonic-buildimage.amd64.ubuntu20_04
pipeline: sonic-net.sonic-buildimage-ubuntu22.04
artifact: sonic-buildimage.amd64.ubuntu22_04
runVersion: 'latestFromBranch'
runBranch: 'refs/heads/${{ parameters.sonic_buildimage_ubuntu20_04 }}'
runBranch: 'refs/heads/master'
path: $(Build.ArtifactStagingDirectory)/download
displayName: "Download sonic buildimage ubuntu20.04 deb packages"
displayName: "Download sonic buildimage ubuntu22.04 deb packages"

- script: |
set -ex
ls -l

# install packages for vs test
sudo pip3 install pytest flaky exabgp docker redis

# install packages for kvm test
sudo apt-get -o DPkg::Lock::Timeout=600 install -y libvirt-clients \
qemu \
openvswitch-switch \
net-tools \
bridge-utils \
vlan \
python3-libvirt \
libzmq3-dev \
libzmq5 \
libboost-serialization1.74.0 \
libboost1.74-dev \
libboost-dev \
libhiredis0.14 \
libyang-dev \
uuid-dev \
net-tools \
bridge-utils \
vlan

sudo sonic-swss-common/.azure-pipelines/build_and_install_module.sh

sudo apt-get install -y libhiredis0.14 libyang0.16
sudo dpkg -i $(Build.ArtifactStagingDirectory)/download/libprotobuf*_amd64.deb $(Build.ArtifactStagingDirectory)/download/libprotobuf-lite*_amd64.deb $(Build.ArtifactStagingDirectory)/download/python3-protobuf*_amd64.deb
sudo dpkg -i $(Build.ArtifactStagingDirectory)/download/libdashapi*.deb
sudo dpkg -i --force-confask,confnew $(Build.ArtifactStagingDirectory)/download/libswsscommon_1.0.0_amd64.deb || apt-get install -f
sudo dpkg -i $(Build.ArtifactStagingDirectory)/download/python3-swsscommon_1.0.0_amd64.deb

# install packages for vs test
sudo apt-get install -y net-tools bridge-utils vlan
sudo apt-get install -y python3-pip
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
displayName: "Install dependencies"

- script: |
Expand Down
12 changes: 6 additions & 6 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@ stages:

jobs:
- job:
displayName: "amd64/ubuntu-20.04"
displayName: "amd64/ubuntu-22.04"
pool:
vmImage: 'ubuntu-20.04'
vmImage: 'ubuntu-22.04'

steps:
- script: |
Expand All @@ -78,14 +78,14 @@ stages:
displayName: "Install dependencies"
- script: |
./autogen.sh
dpkg-buildpackage -rfakeroot -us -uc -b -j$(nproc) && cp ../*.deb .
dpkg-buildpackage -us -uc -Pnopython2 -b -j$(nproc) && cp ../*.deb .
displayName: "Compile sonic swss common"
- script: |
bazel build //...
bazel test //...
displayName: "Compile and test all Bazel targets"
- publish: $(System.DefaultWorkingDirectory)/
artifact: sonic-swss-common.amd64.ubuntu20_04
artifact: sonic-swss-common.amd64.ubuntu22_04
displayName: "Archive swss common debian packages"

- template: .azure-pipelines/build-template.yml
Expand All @@ -105,7 +105,7 @@ stages:
parameters:
arch: armhf
timeout: 180
pool: sonicbld-armhf
pool: sonicso1ES-armhf
sonic_slave: sonic-slave-${{ parameters.debian_version }}-armhf:$(BUILD_BRANCH)
artifact_name: sonic-swss-common.armhf
debian_version: ${{ parameters.debian_version }}
Expand All @@ -114,7 +114,7 @@ stages:
parameters:
arch: arm64
timeout: 180
pool: sonicbld-arm64
pool: sonicso1ES-arm64
sonic_slave: sonic-slave-${{ parameters.debian_version }}-arm64:$(BUILD_BRANCH)
artifact_name: sonic-swss-common.arm64
debian_version: ${{ parameters.debian_version }}
Expand Down
Loading