local ARS

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

@@ -29,7 +29,7 @@ jobs:
   timeoutInMinutes: ${{ parameters.timeout }}
 
   pool:
-    vmImage: 'ubuntu-20.04'
+    vmImage: 'ubuntu-22.04'
 
   steps:
   - checkout: self

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

@@ -9,17 +9,14 @@ parameters:
 - name: pool
   type: string
   values:
-  - sonicbld
+  - sonicso1ES-amd64
   - default
   default: default
 
 - name: timeout
   type: number
   default: 90
 
-- name: sonic_slave
-  type: string
-
 - name: debian_version
   type: string
   default: buster
@@ -46,10 +43,10 @@ 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 }}
+    image: sonicdev-microsoft.azurecr.io:443/sonic-slave-${{ parameters.debian_version }}:$(BUILD_BRANCH)-${{ parameters.arch }}
     options:  "--privileged"
 
   steps:
@@ -102,8 +99,9 @@ jobs:
       path: $(Build.ArtifactStagingDirectory)/download
       artifact: common-lib
       patterns: |
-        target/debs/${{ parameters.debian_version }}/libyang-*.deb
-        target/debs/${{ parameters.debian_version }}/libyang_*.deb
+        target/debs/${{ parameters.debian_version }}/libyang3_*.deb
+        target/debs/${{ parameters.debian_version }}/libyang-dev_3*.deb
+        target/debs/${{ parameters.debian_version }}/python3-libyang*.deb
     displayName: "Download libyang from common lib"
   - script: |
       set -ex
@@ -126,7 +124,7 @@ jobs:
       set -ex
       rm ../*.deb || true
       ./autogen.sh
-      DEB_BUILD_OPTIONS=nocheck DEB_BUILD_PROFILES=nopython2 fakeroot dpkg-buildpackage -b -us -uc -Psyncd,vs,nopython2 -j$(nproc)
+      DEB_BUILD_OPTIONS=nocheck dpkg-buildpackage -b -us -uc -Psyncd,vs,nopython2 -j$(nproc)
       # Add SYS_TIME capability for settimeofday ok in syncd test
       sudo setcap "cap_sys_time=eip" syncd/.libs/syncd_tests
       # Add CAP_DAC_OVERRIDE capability for system directory creation in syncd unittest

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

@@ -10,16 +10,13 @@ parameters:
 - name: pool
   type: string
   values:
-  - sonicbld
+  - sonicso1ES-amd64
   - default
   default: default
 
 - name: timeout
   type: number
-  default: 60
-
-- name: sonic_slave
-  type: string
+  default: 90
 
 - name: debian_version
   type: string
@@ -42,10 +39,10 @@ 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 }}
+    image: sonicdev-microsoft.azurecr.io:443/sonic-slave-${{ parameters.debian_version }}:$(BUILD_BRANCH)-${{ parameters.arch }}
 
   steps:
   - checkout: sonic-swss
@@ -105,11 +102,13 @@ jobs:
         target/debs/${{ parameters.debian_version }}/libnl-genl*.deb
         target/debs/${{ parameters.debian_version }}/libnl-route*.deb
         target/debs/${{ parameters.debian_version }}/libnl-nf*.deb
-        target/debs/${{ parameters.debian_version }}/libyang-*.deb
-        target/debs/${{ parameters.debian_version }}/libyang_*.deb
+        target/debs/${{ parameters.debian_version }}/libyang3_*.deb
+        target/debs/${{ parameters.debian_version }}/libyang-dev_3*.deb
+        target/debs/${{ parameters.debian_version }}/python3-libyang*.deb
         target/debs/${{ parameters.debian_version }}/libprotobuf*.deb
         target/debs/${{ parameters.debian_version }}/libprotoc*.deb
         target/debs/${{ parameters.debian_version }}/protobuf-compiler*.deb
+        target/debs/${{ parameters.debian_version }}/libnexthopgroup*.deb
     displayName: "Download common libs"
   - task: DownloadPipelineArtifact@2
     inputs:

.azure-pipelines/build-template.yml

@@ -9,19 +9,16 @@ parameters:
 - name: pool
   type: string
   values:
-  - sonicbld
-  - sonicbld-arm64
-  - sonicbld-armhf
+  - sonicso1ES-amd64
+  - sonicso1ES-arm64
+  - sonicso1ES-armhf
   - default
   default: default
 
 - name: timeout
   type: number
   default: 60
 
-- name: sonic_slave
-  type: string
-
 - name: artifact_name
   type: string
 
@@ -50,10 +47,10 @@ 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 }}
+    image: sonicdev-microsoft.azurecr.io:443/sonic-slave-${{ parameters.debian_version }}:$(BUILD_BRANCH)-${{ parameters.arch }}
 
   steps:
   - checkout: self
@@ -82,36 +79,103 @@ jobs:
       ${{ else }}:
         artifact: common-lib.${{ parameters.arch }}
       patterns: |
-        target/debs/${{ parameters.debian_version }}/libyang-*.deb
-        target/debs/${{ parameters.debian_version }}/libyang_*.deb
+        target/debs/${{ parameters.debian_version }}/libyang3_*.deb
+        target/debs/${{ parameters.debian_version }}/libyang-dev_3*.deb
+        target/debs/${{ parameters.debian_version }}/python3-libyang*.deb
+    displayName: "Download libyang from ${{ parameters.arch }} common lib"
+    condition: ne('${{ parameters.debian_version }}', 'trixie')
+  - task: DownloadPipelineArtifact@2
+    inputs:
+      source: specific
+      project: build
+      pipeline: Azure.sonic-buildimage.common_libs
+      runVersion: 'latestFromBranch'
+      runBranch: 'refs/heads/$(BUILD_BRANCH)'
+      path: $(Build.ArtifactStagingDirectory)/download
+      ${{ if eq(parameters.arch, 'amd64') }}:
+        artifact: common-lib
+      ${{ else }}:
+        artifact: common-lib.${{ parameters.arch }}
+      patterns: |
+        target/debs/${{ parameters.debian_version }}/libyang3_*.deb
+        target/debs/${{ parameters.debian_version }}/libyang-dev_3*.deb
+        target/debs/${{ parameters.debian_version }}/python3-libyang*.deb
+        target/debs/${{ parameters.debian_version }}/libpcre*.deb
     displayName: "Download libyang from ${{ parameters.arch }} common lib"
+    condition: eq('${{ parameters.debian_version }}', 'trixie')
   - script: |
       set -ex
       sudo dpkg -i $(find ./download -name *.deb)
     workingDirectory: $(Build.ArtifactStagingDirectory)
     displayName: "Install libyang from common lib"
+  - task: DownloadPipelineArtifact@2
+    inputs:
+      source: specific
+      project: build
+      pipeline: 142
+      artifact: sonic-buildimage.vs
+      runVersion: 'latestFromBranch'
+      runBranch: 'refs/heads/$(BUILD_BRANCH)'
+      path: $(Build.ArtifactStagingDirectory)/download
+      patterns: |
+        target/python-wheels/${{ parameters.debian_version }}/sonic_yang_mgmt-1.0-py3-none-any.whl
+        target/python-wheels/${{ parameters.debian_version }}/sonic_yang_models-1.0-py3-none-any.whl
+    displayName: "Download yang wheel from latest sonic-buildimage build"
+    condition: ne('${{ parameters.debian_version }}', 'trixie')
+  - task: DownloadPipelineArtifact@2
+    inputs:
+      source: specific
+      project: build
+      pipeline: 142
+      artifact: sonic-buildimage.vs
+      runVersion: 'latestFromBranch'
+      runBranch: 'refs/heads/$(BUILD_BRANCH)'
+      path: $(Build.ArtifactStagingDirectory)/download
+      patterns: |
+        target/python-wheels/bookworm/sonic_yang_mgmt-1.0-py3-none-any.whl
+        target/python-wheels/bookworm/sonic_yang_models-1.0-py3-none-any.whl
+    displayName: "Download yang wheel from latest sonic-buildimage build"
+    condition: eq('${{ parameters.debian_version }}', 'trixie')
+  - script: |
+      set -ex
+      sudo pip3 install ./download/target/python-wheels/${{ parameters.debian_version }}/sonic_yang_mgmt-1.0-py3-none-any.whl \
+                        ./download/target/python-wheels/${{ parameters.debian_version }}/sonic_yang_models-1.0-py3-none-any.whl
+    workingDirectory: $(Build.ArtifactStagingDirectory)
+    displayName: "Install yang wheel from common lib"
+    condition: ne('${{ parameters.debian_version }}', 'trixie')
+  - script: |
+      set -ex
+      sudo pip3 install ./download/target/python-wheels/bookworm/sonic_yang_mgmt-1.0-py3-none-any.whl \
+                        ./download/target/python-wheels/bookworm/sonic_yang_models-1.0-py3-none-any.whl
+    workingDirectory: $(Build.ArtifactStagingDirectory)
+    displayName: "Install yang wheel from common lib"
+    condition: eq('${{ parameters.debian_version }}', 'trixie')
   - script: |
       set -ex
       rm ../*.deb || true
       ./autogen.sh
-      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
+      DEB_CONFIGURE_EXTRA_FLAGS='--enable-code-coverage' DEB_CXXFLAGS_APPEND="-coverage -fprofile-abs-path" DEB_LDFLAGS_APPEND="-coverage -fprofile-abs-path" dpkg-buildpackage -Pnopython2 -us -uc -b -j$(nproc)
       mv ../*.deb .
     displayName: "Compile sonic swss common with coverage enabled"
   - ${{ if eq(parameters.run_unit_test, true) }}:
     - script: |
         set -ex
         sudo pip install Pympler==0.8 pytest
         sudo apt-get install -y redis-server
+        sudo dpkg -i libswsscommon_*.deb
+        sudo dpkg -i libswsscommon-dev_*.deb
+        sudo dpkg -i python3-swsscommon_*.deb
+
+        ps aux
+        cargo test           --workspace --all-features
+        cargo test --release --workspace --all-features
+
         sudo sed -i 's/notify-keyspace-events ""/notify-keyspace-events AKE/' /etc/redis/redis.conf
         sudo sed -ri 's/^# unixsocket/unixsocket/' /etc/redis/redis.conf
         sudo sed -ri 's/^unixsocketperm .../unixsocketperm 777/' /etc/redis/redis.conf
         sudo sed -ri 's/redis-server.sock/redis.sock/' /etc/redis/redis.conf
         sudo service redis-server restart
-        sudo mkdir /usr/local/yang-models
-
-        sudo dpkg -i libswsscommon_*.deb
-        sudo dpkg -i libswsscommon-dev_*.deb
-        sudo dpkg -i python3-swsscommon_*.deb
+        sudo mkdir -p /usr/local/yang-models
 
         ./tests/tests
         redis-cli FLUSHALL

.azure-pipelines/build_and_install_module.sh

@@ -7,11 +7,21 @@ set -e
 
 source /etc/os-release
 
-function build_and_install_kmodule()
+trim() {
+    local var="$*"
+    # remove leading whitespace characters
+    var="${var#"${var%%[![:space:]]*}"}"
+    # remove trailing whitespace characters
+    var="${var%"${var##*[![:space:]]}"}"
+    printf '%s' "$var"
+}
+
+
+build_and_install_kmodule()
 {
     if sudo modprobe team 2>/dev/null && sudo modprobe vrf 2>/dev/null && sudo modprobe macsec 2>/dev/null; then
         echo "The module team, vrf and macsec exist."
-        return
+        return 0
     fi
 
     [ -z "$WORKDIR" ] && WORKDIR=$(mktemp -d)
@@ -30,31 +40,31 @@ function build_and_install_kmodule()
     apt-get install -y build-essential linux-headers-${KERNEL_RELEASE} autoconf pkg-config fakeroot
     apt-get install -y flex bison libssl-dev libelf-dev dwarves
     apt-get install -y libnl-route-3-200 libnl-route-3-dev libnl-cli-3-200 libnl-cli-3-dev libnl-3-dev
-    # Install libs required by libswsscommon for build
-    apt-get install -y libzmq3-dev libzmq5 libboost-serialization-dev uuid-dev
 
     # Add the apt source mirrors and download the linux image source code
     cp /etc/apt/sources.list /etc/apt/sources.list.bk
     sed -i "s/^# deb-src/deb-src/g" /etc/apt/sources.list
     apt-get update
-    KERNEL_PACKAGE_SOURCE=$(apt-cache show linux-image-unsigned-${KERNEL_RELEASE} | grep ^Source: | cut -d':' -f 2)
-    KERNEL_PACKAGE_VERSION=$(apt-cache show linux-image-unsigned-${KERNEL_RELEASE} | grep ^Version: | cut -d':' -f 2)
-    SOURCE_PACKAGE_VERSION=$(apt-cache showsrc ${KERNEL_PACKAGE_SOURCE} | grep ^Version: | cut -d':' -f 2)
-    if [ ${KERNEL_PACKAGE_VERSION} != ${SOURCE_PACKAGE_VERSION} ]; then
+    KERNEL_PACKAGE_SOURCE=$(trim $(apt-cache show linux-image-unsigned-${KERNEL_RELEASE} | grep ^Source: | cut -d':' -f 2))
+    KERNEL_PACKAGE_VERSION=$(trim $(apt-cache show linux-image-unsigned-${KERNEL_RELEASE} | grep ^Version: | cut -d':' -f 2))
+    SOURCE_PACKAGE_VERSION=$(apt-cache showsrc "${KERNEL_PACKAGE_SOURCE}" | grep ^Version: | cut -d':' -f 2 | tr '\n' ' ')
+    if ! echo "${SOURCE_PACKAGE_VERSION}" | grep "\b${KERNEL_PACKAGE_VERSION}\b"; then
         echo "WARNING: the running kernel version (${KERNEL_PACKAGE_VERSION}) doesn't match the source package " \
             "version (${SOURCE_PACKAGE_VERSION}) being downloaded. There's no guarantee the module being downloaded " \
             "can be loaded into the kernel or function correctly. If possible, please update your kernel and reboot " \
             "your system so that it's running the matching kernel version." >&2
         echo "Continuing with the build anyways" >&2
+        apt-get source "linux-image-unsigned-${KERNEL_RELEASE}"
+    else
+        apt-get source "linux-image-unsigned-${KERNEL_RELEASE}=${KERNEL_PACKAGE_VERSION}"
     fi
-    apt-get source linux-image-unsigned-${KERNEL_RELEASE} > source.log
 
     # Recover the original apt sources list
     cp /etc/apt/sources.list.bk /etc/apt/sources.list
     apt-get update
 
     # Build the Linux kernel module drivers/net/team and vrf
-    cd $(find . -maxdepth 1 -type d | grep -v "^.$")
+    cd ${KERNEL_PACKAGE_SOURCE}-*
     if [ -e debian/debian.env ]; then
         source debian/debian.env
         if [ -n "${DEBIAN}" -a -e ${DEBIAN}/reconstruct ]; then
@@ -65,6 +75,7 @@ function build_and_install_kmodule()
     mv .config .config.bk
     cp /boot/config-$(uname -r) .config
     grep NET_TEAM .config.bk >> .config
+    make olddefconfig
     make VERSION=$VERSION PATCHLEVEL=$PATCHLEVEL SUBLEVEL=$SUBLEVEL EXTRAVERSION=-${EXTRAVERSION} LOCALVERSION=-${LOCALVERSION} modules_prepare
     cp /usr/src/linux-headers-$(uname -r)/Module.symvers .
     make -j$(nproc) M=drivers/net/team

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

@@ -5,10 +5,13 @@ ARG need_dbg
 
 COPY ["debs", "/debs"]
 
-# Remove existing packages first before installing the new/current packages. This is to overcome limitations with
+# Remove the libswsscommon package first with force all option.
+# Remove the other existing packages before installing the new/current packages. This is to overcome limitations with
 # Docker's diff detection mechanism, where only the file size and the modification timestamp (which will remain the
 # same, even though contents have changed) are checked between the previous and current layer.
-RUN dpkg --purge libswsscommon python3-swsscommon sonic-db-cli libsaimetadata libsairedis libsaivs syncd-vs swss sonic-eventd libdashapi
+RUN dpkg --remove --force-all libswsscommon
+RUN apt --fix-broken install -y
+RUN dpkg --purge python3-swsscommon sonic-db-cli libsaimetadata libsairedis libsaivs syncd-vs swss sonic-eventd libdashapi
 
 RUN apt-get update
 

.azure-pipelines/docker-sonic-vs/start.sh

@@ -75,6 +75,14 @@ elif [ "$HWSKU" == "DPU-2P" ]; then
     cp /usr/share/sonic/hwsku/sai_dpu_2p.profile /usr/share/sonic/hwsku/sai.profile
 fi
 
+if [ "$BFDOFFLOAD" == "false" ]; then
+    if ! grep -q "SAI_VS_BFD_OFFLOAD_SUPPORTED=" /usr/share/sonic/hwsku/sai.profile; then
+        echo 'SAI_VS_BFD_OFFLOAD_SUPPORTED=false' >> /usr/share/sonic/hwsku/sai.profile
+    else
+        sed -i "s/SAI_VS_BFD_OFFLOAD_SUPPORTED.*/SAI_VS_BFD_OFFLOAD_SUPPORTED=false/g" /usr/share/sonic/hwsku/sai.profile
+    fi
+fi
+
 mkdir -p /etc/swss/config.d/
 
 rm -f /var/run/rsyslogd.pid