Fix env

.azure-pipelines/build-sairedis-template.yml

@@ -15,7 +15,7 @@ parameters:
 
 - name: timeout
   type: number
-  default: 60
+  default: 90
 
 - name: sonic_slave
   type: string
@@ -67,22 +67,19 @@ jobs:
       sudo apt-get update
       sudo apt-get install -qq -y \
         qtbase5-dev \
-        libdbus-glib-1-2 \
         libdbus-glib-1-dev \
         libpcsclite-dev \
         docbook-to-man \
         docbook-utils \
         aspell-en \
-        libhiredis0.14 \
         libhiredis-dev \
         libnl-3-dev \
         libnl-genl-3-dev \
         libnl-route-3-dev \
         libnl-nf-3-dev \
         libnl-cli-3-dev \
-        swig3.0 \
-        libpython2.7-dev \
-        libzmq5 libzmq3-dev
+        swig4.0 \
+        libzmq3-dev
 
       sudo apt-get install -y redis-server
       sudo sed -ri 's/^# unixsocket/unixsocket/' /etc/redis/redis.conf
@@ -129,7 +126,7 @@ jobs:
       set -ex
       rm ../*.deb || true
       ./autogen.sh
-      DEB_BUILD_OPTIONS=nocheck fakeroot dpkg-buildpackage -b -us -uc -Tbinary-syncd-vs -j$(nproc)
+      DEB_BUILD_OPTIONS=nocheck DEB_BUILD_PROFILES=nopython2 fakeroot dpkg-buildpackage -b -us -uc -Tbinary-syncd-vs -j$(nproc)
       # Add SYS_TIME capability for settimeofday ok in syncd test
       sudo setcap "cap_sys_time=eip" syncd/.libs/syncd_tests
       make check

.azure-pipelines/build-swss-template.yml

@@ -64,7 +64,7 @@ jobs:
       sudo apt-get install -y libzmq5 libzmq3-dev
       sudo apt-get install -qq -y \
           libhiredis-dev \
-          swig3.0
+          swig4.0
       sudo apt-get install -y libdbus-1-3
       sudo apt-get install -y libteam-dev \
           libteam5 \

.azure-pipelines/build-template.yml

@@ -35,7 +35,7 @@ parameters:
 
 - name: debian_version
   type: string
-  default: buster
+  default: bullseye
 
 jobs:
 - job:
@@ -94,7 +94,7 @@ jobs:
       set -ex
       rm ../*.deb || true
       ./autogen.sh
-      fakeroot debian/rules DEB_CONFIGURE_EXTRA_FLAGS='--enable-code-coverage' $( if [[ ${{ parameters.debian_version }} == "bullseye" ]]; then echo "DEB_BUILD_PROFILES=nopython2"; fi ) CFLAGS="" CXXFLAGS="--coverage -fprofile-abs-path" LDFLAGS="--coverage -fprofile-abs-path" binary
+      fakeroot debian/rules DEB_CONFIGURE_EXTRA_FLAGS='--enable-code-coverage' DEB_BUILD_PROFILES=nopython2 CFLAGS="" CXXFLAGS="--coverage -fprofile-abs-path" LDFLAGS="--coverage -fprofile-abs-path" binary
       mv ../*.deb .
     displayName: "Compile sonic swss common with coverage enabled"
   - ${{ if eq(parameters.run_unit_test, true) }}:
@@ -121,11 +121,11 @@ jobs:
 
         sudo dpkg -i libswsscommon_*.deb
         sudo dpkg -i libswsscommon-dev_*.deb
-        sudo dpkg -i python-swsscommon_*.deb
+        sudo dpkg -i python3-swsscommon_*.deb
 
         ./tests/tests
         redis-cli FLUSHALL
-        pytest --cov=. --cov-report=xml
+        pytest-3 --cov=. --cov-report=xml
         mv coverage.xml tests/coverage.xml
         gcovr -r ./ -e ".*/swsscommon_wrap.cpp" --exclude-unreachable-branches --exclude-throw-branches --gcov-ignore-parse-errors -x --xml-pretty  -o coverage.xml
         make -C goext
@@ -142,9 +142,9 @@ jobs:
         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
+        sudo apt-get install -y dotnet-sdk-6.0
       displayName: "Install .NET CORE"
     - task: PublishCodeCoverageResults@1
       inputs:

.azure-pipelines/docker-sonic-vs/Dockerfile

@@ -4,16 +4,4 @@ ARG docker_container_name
 
 ADD ["debs", "/debs"]
 
-RUN dpkg --purge python-swsscommon python3-swsscommon swss libsairedis sonic-db-cli libswsscommon libsaimetadata libsaivs syncd-vs
-
-RUN dpkg -i /debs/libswsscommon_1.0.0_amd64.deb
-RUN dpkg -i /debs/python-swsscommon_1.0.0_amd64.deb
-RUN dpkg -i /debs/python3-swsscommon_1.0.0_amd64.deb
-RUN dpkg -i /debs/sonic-db-cli_1.0.0_amd64.deb
-
-RUN dpkg -i /debs/libsaimetadata_1.0.0_amd64.deb
-RUN dpkg -i /debs/libsairedis_1.0.0_amd64.deb
-RUN dpkg -i /debs/libsaivs_1.0.0_amd64.deb
-RUN dpkg -i /debs/syncd-vs_1.0.0_amd64.deb
-
-RUN dpkg -i /debs/swss_1.0.0_amd64.deb
+RUN dpkg -i /debs/libswsscommon_1.0.0_amd64.deb /debs/python3-swsscommon_1.0.0_amd64.deb /debs/sonic-db-cli_1.0.0_amd64.deb /debs/libsaimetadata_1.0.0_amd64.deb /debs/libsairedis_1.0.0_amd64.deb /debs/libsaivs_1.0.0_amd64.deb /debs/syncd-vs_1.0.0_amd64.deb /debs/swss_1.0.0_amd64.deb

azure-pipelines.yml

@@ -40,7 +40,7 @@ resources:
 parameters:
   - name: debian_version
     type: string
-    default: buster
+    default: bullseye
 variables:
   - name: BUILD_BRANCH
     ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
@@ -119,18 +119,6 @@ stages:
       artifact_name: sonic-swss-common.arm64
       debian_version: ${{ parameters.debian_version }}
 
-- stage: BuildBullseye
-  dependsOn: Build
-  condition: succeeded('Build')
-  jobs:
-  - template: .azure-pipelines/build-template.yml
-    parameters:
-      arch: amd64
-      timeout: 180
-      sonic_slave: sonic-slave-bullseye:$(BUILD_BRANCH)
-      artifact_name: sonic-swss-common.bullseye.amd64
-      debian_version: bullseye
-
 - stage: BuildSairedis
   dependsOn: Build
   condition: succeeded('Build')