[code sync] Merge code from sonic-net/sonic-buildimage:202505 to 202506 (#1905)

```<br>* 04c97e8 - (HEAD -> 202506) Merge branch '202505' of https://github.com/sonic-net/sonic-buildimage into 202506 (2025-12-19) [Sonic Automation]
* ec03b77 - (head/202505) Enable buster for 202505 (#24889) (2025-12-18) [yijingyan2]
* 44ce0e7 - [submodule] Update submodule sonic-swss to the latest HEAD automatically (#24861) (2025-12-18) [mssonicbld]
* 51e5564 - [Orcas][TH5] Set sai_stats_support_mask to 0x884 for Arista-7060X6-64PE-B-O128 and update comments (#24886) (2025-12-18) [mssonicbld]<br>```

Author: mssonicbld

.azure-pipelines/azure-pipelines-build.yml

@@ -146,8 +146,8 @@ jobs:
               mv target/sonic-vs.vhdx.gz target/sonic-vs-k8s.vhdx.gz
               rm target/sonic-vs.img
             fi
-            make $BUILD_OPTIONS target/docker-sonic-vs.gz target/sonic-vs.img.gz target/docker-ptf.gz
-            make $BUILD_OPTIONS target/docker-ptf-sai.gz
+            make $BUILD_OPTIONS target/docker-sonic-vs.gz target/sonic-vs.img.gz
+            make $BUILD_OPTIONS target/docker-ptf-sai.gz target/docker-ptf.gz
             if [ $(Build.Reason) != 'PullRequest' ];then
               gzip -kd target/sonic-vs.img.gz
               SONIC_RUN_CMDS="qemu-img convert target/sonic-vs.img -O vhdx -o subformat=dynamic target/sonic-vs.vhdx" make $BUILD_OPTIONS sonic-slave-run

.azure-pipelines/azure-pipelines-image-template.yml

@@ -40,6 +40,9 @@ jobs:
             CACHE_OPTIONS="SONIC_DPKG_CACHE_METHOD=$(CACHE_MODE) SONIC_DPKG_CACHE_SOURCE=/nfs/dpkg_cache/$(PLATFORM_AZP)"
             BUILD_OPTIONS="$BUILD_OPTIONS $CACHE_OPTIONS"
           fi
+          if echo $(PLATFORM_AZP) | grep -E -q "^vs$"; then
+            BUILD_OPTIONS="$BUILD_OPTIONS NOBUSTER=0"
+          fi
           echo $BUILD_OPTIONS
           echo "##vso[task.setvariable variable=BUILD_OPTIONS]$BUILD_OPTIONS"
         displayName: "Set cache options"

.azure-pipelines/docker-sonic-slave-template.yml

@@ -54,10 +54,8 @@ jobs:
       build_options="$(VERSION_CONTROL_OPTIONS)"
       image_tag=$(BLDENV=${{ parameters.dist }} make -f Makefile.work showtag $build_options PLATFORM=generic PLATFORM_ARCH=${{ parameters.arch }} | grep sonic-slave | tail -n 1)
       image_latest=$(echo $(echo $image_tag | awk -F: '{print$1}'):latest)
-      if echo ${{ parameters.pool }} | grep ${{ parameters.arch }};then
-        image_latest=$(echo ${image_latest} | sed 's/:/-${{ parameters.arch }}:/')
-      fi
-      image_branch=$(echo $(echo $image_latest | awk -F: '{print$1}'):$(Build.SourceBranchName))
+      image_branch=$(echo $(echo $image_tag | awk -F: '{print$1}'):$(Build.SourceBranchName))
+      image_branch_arch=$(echo $(echo $image_tag | awk -F: '{print$1}'):$(Build.SourceBranchName)-${{ parameters.arch }})
       docker rmi $image_tag || true
 
       if [[ "$(Build.Reason)" =~ [a-zA-Z]*CI ]] && docker pull ${{ parameters.registry_url }}/${image_tag};then
@@ -71,11 +69,15 @@ jobs:
 
       docker tag ${image_tag} ${REGISTRY_SERVER}/${image_tag}
       docker push ${REGISTRY_SERVER}/${image_tag}
-      docker tag ${image_tag} ${REGISTRY_SERVER}/${image_branch}
-      docker push ${REGISTRY_SERVER}/${image_branch}
-      if [[ "$(Build.SourceBranchName)" == "master" ]];then
-        docker tag ${image_tag} ${REGISTRY_SERVER}/${image_latest}
-        docker push ${REGISTRY_SERVER}/${image_latest}
+      docker tag ${image_tag} ${REGISTRY_SERVER}/${image_branch_arch}
+      docker push ${REGISTRY_SERVER}/${image_branch_arch}
+      if [[ "${{ parameters.arch }}" == "amd64" ]];then
+        docker tag ${image_tag} ${REGISTRY_SERVER}/${image_branch}
+        docker push ${REGISTRY_SERVER}/${image_branch}
+        if [[ "$(Build.SourceBranchName)" == "master" ]];then
+          docker tag ${image_tag} ${REGISTRY_SERVER}/${image_latest}
+          docker push ${REGISTRY_SERVER}/${image_latest}
+        fi
       fi
     env:
       REGISTRY_SERVER: ${{ parameters.registry_url }}

device/arista/x86_64-arista_7060x6_16pe_384c_b/Arista-7060X6-16PE-384C-B-O128S2/th5-a7060x6-16pe-384c.config.bcm

@@ -1410,7 +1410,8 @@ bcm_device:
     0:
         global:
             ftem_mem_entries: 65536
-            #enable port queue drop stats + enable egress queue drop flex counter
+            # bit 2: enable egress queue drop flex counter
+            # bit 11: enable port queue drop stats
             sai_stats_support_mask: 0x804
             #disable vxlan tunnel stats
             sai_stats_disable_mask: 0x200

device/arista/x86_64-arista_7060x6_64pe_b/Arista-7060X6-64PE-B-O128/th5-a7060x6-64pe.config.bcm

@@ -1382,8 +1382,10 @@ bcm_device:
     0:
         global:
             ftem_mem_entries: 65536
-            #enable port queue drop stats + enable egress queue drop flex counter
-            sai_stats_support_mask: 0x804
+            # bit 2: enable egress queue drop flex counter
+            # bit 7: enable SRv6 MY_SID counters
+            # bit 11: enable port queue drop stats
+            sai_stats_support_mask: 0x884
             #disable vxlan tunnel stats
             sai_stats_disable_mask: 0x200
             #For PPIU Mode, Set resources for counters in global mode counters like ACL, etc

files/build/versions/build/build-sonic-slave-bookworm/versions-deb-bookworm

@@ -1,17 +1,18 @@
 bfscripts==4.11.0-13611
-doca-sdk-argp==2.9.0072-1
-doca-sdk-common==2.9.0072-1
-doca-sdk-dpdk-bridge==2.9.0072-1
-doca-sdk-flow==2.9.0072-1
+doca-sdk-argp==3.0.0058-1
+doca-sdk-common==3.0.0058-1
+doca-sdk-dpdk-bridge==3.0.0058-1
+doca-sdk-flow==3.0.0058-1
+gpio-mlxbf3-dkms==1.0-0
 kernel-mft-dkms==4.32.0-120
 kernel-mft-dkms-modules-6.1.0-29-2-arm64==4.32.0
 libdashapi==1.0.0
-libdoca-sdk-argp-dev==2.9.0072-1
-libdoca-sdk-common-dev==2.9.0072-1
-libdoca-sdk-dpdk-bridge-dev==2.9.0072-1
-libdoca-sdk-flow-dev==2.9.0072-1
+libdoca-sdk-argp-dev==3.0.0058-1
+libdoca-sdk-common-dev==3.0.0058-1
+libdoca-sdk-dpdk-bridge-dev==3.0.0058-1
+libdoca-sdk-flow-dev==3.0.0058-1
 libgrpc-dev==1.39.0-1
-libibverbs-dev==2501mlnx56-1.2501060
+libibverbs-dev==2501mlnx56-1.2504061
 libnl-3-dev==3.7.0-0.2+b1sonic1
 libnl-cli-3-200==3.7.0-0.2+b1sonic1
 libnl-cli-3-dev==3.7.0-0.2+b1sonic1
@@ -20,6 +21,8 @@ libnl-genl-3-dev==3.7.0-0.2+b1sonic1
 libnl-nf-3-200==3.7.0-0.2+b1sonic1
 libnl-nf-3-dev==3.7.0-0.2+b1sonic1
 libnl-route-3-dev==3.7.0-0.2+b1sonic1
+libnvhws-dev==25.04-1
+libnvhws1==25.04-1
 librxpcompiler-dev==22.05.1
 libsai==1.0.0
 libsaimetadata==1.0.0
@@ -44,26 +47,35 @@ linux-headers-6.1.0-29-2-arm64==6.1.123-1
 linux-headers-6.1.0-29-2-common==6.1.123-1
 mft==4.32.0-120
 mft-oem==4.32.0-120
-mlnx-dpdk==22.11.0-2410.1.0
-mlnx-dpdk-dev==22.11.0-2410.1.0
-mlnx-iproute2==6.12.0-1.2501060
-mlnx-ofed-kernel-utils==25.01.OFED.25.01.0.6.0.1-1
-mlnx-tools==25.01-0.2501060
+mlnx-dpdk==22.11.0-2504.1.0
+mlnx-dpdk-dev==22.11.0-2504.1.0
+mlnx-iproute2==6.12.0-1.2504061
+mlnx-ofed-kernel-dkms==25.04.OFED.25.04.0.6.1.1-1
+mlnx-ofed-kernel-utils==25.04.OFED.25.04.0.6.1.1-1
+mlnx-tools==25.01-0.2504061
+mlx-bootctl-dkms==1.3-0
 mlxbf-bootctl==2.1
 mlxbf-bootimages==4.11.0-13611
+mlxbf-gige-dkms==1.0-0
+mlxbf-pka-dkms==2.0-1
+mlxbf-ptm-dkms==1.0-0
+mlxbf-tmfifo-dkms==1.0-0
 p4lang-bmv2==1.15.0-7
 p4lang-p4c==1.2.4.2-2
 p4lang-pi==0.1.0-15
+pinctrl-mlxbf3-dkms==1.0-0
+pwr-mlxbf-dkms==1.0-0
 python3-swsscommon==1.0.0
 python3-yang==1.0.73
-rdma-core==2501mlnx56-1.2501060
+rdma-core==2501mlnx56-1.2504061
 rxp-compiler==22.05.1
+sdhci-of-dwcmshc-dkms==1.0-0
 sdn-appliance==1.5-1mlnx1
 sonic-bmp==0.1
 sonic-mgmt-common==1.0.0
 sonic-mgmt-common-codegen==1.0.0
 sonic-platform-pddf==1.1
 sonic-platform-pddf-sym==1.1
 stp==1.0.0
-sys-sdk-dev==1.mlnx.4.7.4040
-sys-sdk-main==1.mlnx.4.7.4040
+sys-sdk-dev==1.mlnx.4.8.1086
+sys-sdk-main==1.mlnx.4.8.1086

files/build/versions/build/build-sonic-slave-bookworm/versions-py3

@@ -30,7 +30,7 @@ pycparser==2.22
 pynacl==1.5.0
 pyroute2==0.7.12
 python-arptable==0.0.2
-python-sdk-api==4.7.4040
+python-sdk-api==4.8.1086
 scp==0.14.5
 semantic-version==2.10.0
 systemd-python==235

files/build/versions/default/versions-docker

@@ -1,15 +1,9 @@
-amd64:amd64/debian:bookworm==sha256:f8358091727a86df2275a4dc8b91e69a71225ae563837c32357b584c7b3607fc
-amd64:amd64/debian:bullseye==sha256:da5c2dc5e036efbfa25b4a0abfb41e497a44c3e9ab630e8ef6699600790511e7
-amd64:debian:bookworm==sha256:d42b86d7e24d78a33edcf1ef4f65a20e34acb1e1abd53cabc3f7cdf769fc4082
-amd64:debian:bullseye==sha256:6d4f6b40afca63b59a44ffcedbb2e457e83b645710916d7f094b79c6c591ac28
+amd64:amd64/debian:bookworm==sha256:830fe902fd6e29c2d3cebef306cd5a9b33f49ca4322f6ef82847e19f987fb282
+amd64:debian:bookworm==sha256:7e5bc0e499a8d50cb1e32287944a90b9ec8fd7d500673e75daff3f52882f5798
+amd64:debian:bullseye==sha256:f58b816c2acc96e3e1dfe6b6c166c3d52b5541571ac4fa72a64a0bb5beaf25a3
 amd64:debian:buster==sha256:58ce6f1271ae1c8a2006ff7d3e54e9874d839f573d8009c20154ad0f2fb0a225
 amd64:p4lang/behavioral-model@sha256:ce45720e28a96a50f275c1b511cd84c2558b62f2cf7a7e506765183bc3fb2e32==sha256:ce45720e28a96a50f275c1b511cd84c2558b62f2cf7a7e506765183bc3fb2e32
-arm64:arm64v8/debian:bookworm==sha256:5d8e08483c19febed86ca47f3fce17308585874ae4e2ba047c6fcc6cefae0ea1
-arm64:arm64v8/debian:bullseye==sha256:6861e278c779adeeaa96eb520588ea8fd85a7af29a7b2400a68316613f3f87ee
-arm64:debian:bookworm==sha256:d42b86d7e24d78a33edcf1ef4f65a20e34acb1e1abd53cabc3f7cdf769fc4082
-arm64:debian:bullseye==sha256:6d4f6b40afca63b59a44ffcedbb2e457e83b645710916d7f094b79c6c591ac28
-arm64:debian:buster==sha256:58ce6f1271ae1c8a2006ff7d3e54e9874d839f573d8009c20154ad0f2fb0a225
-armhf:arm32v7/debian:bookworm==sha256:878df3e9efc935672fb6e70784a829a9083c161cfce4190efa1157580b58a0da
-armhf:debian:bookworm==sha256:d42b86d7e24d78a33edcf1ef4f65a20e34acb1e1abd53cabc3f7cdf769fc4082
-armhf:debian:bullseye==sha256:6d4f6b40afca63b59a44ffcedbb2e457e83b645710916d7f094b79c6c591ac28
-armhf:debian:buster==sha256:58ce6f1271ae1c8a2006ff7d3e54e9874d839f573d8009c20154ad0f2fb0a225
+arm64:arm64v8/debian:bookworm==sha256:6ee560263164f07cdf4b03efbd60a2bb0d323dcd399c4197d5be599802ecd621
+arm64:debian:bookworm==sha256:7e5bc0e499a8d50cb1e32287944a90b9ec8fd7d500673e75daff3f52882f5798
+armhf:arm32v7/debian:bookworm==sha256:8d8e05122934174c2007368565aff508cb3dcfa194919e95f59d584e51246930
+armhf:debian:bookworm==sha256:7e5bc0e499a8d50cb1e32287944a90b9ec8fd7d500673e75daff3f52882f5798

files/build/versions/default/versions-git

@@ -1,23 +1,23 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==abc51098824678cbce29d7913c4951a857033c49
-https://github.com/aristanetworks/swi-tools.git==989aec67105f565836364b4167c9566c132d0b54
-https://github.com/CESNET/libyang.git==da7272e19d9e27d1bfdd68108fa9dce25fbdf5e8
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==49e90f2d01a6c5e8fe6b9aee0e14933755df0edd
+https://github.com/aristanetworks/swi-tools.git==f1eb6920bf0b6fbecd8f1521a424c1f437db0af1
+https://github.com/CESNET/libyang.git==3d07c3a71534a580c3960907da17568eff7e5c64
 https://github.com/daveolson53/audisp-tacplus.git==559c9f22edd4f2dea0ecedffb3ad9502b12a75b6
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
 https://github.com/dyninc/OpenBFDD.git==e35f43ad8d2b3f084e96a84c392528a90d05a287
-https://github.com/facebook/tac_plus==4b1d611e0ee243ba6d98eaead76cddbebf6b0d18
-https://github.com/flashrom/flashrom.git==966cd5194c10bb1913605fb72e7d3727b0b6c641
-https://github.com/FreeRADIUS/freeradius-server.git==ecfa4bf70159b3462145703726f3a4ce309cb9b4
+https://github.com/facebook/tac_plus==dd38c2d727ff252ab2e1188c6d7087425376d845
+https://github.com/flashrom/flashrom.git==0b3de1a16b6090b0fbdaa1dab8ac730ffddb6750
+https://github.com/FreeRADIUS/freeradius-server.git==90f531414ea5982fb88bcc4431f5be09761ced3b
 https://github.com/FreeRADIUS/pam_radius.git==d17fc655f0007728b67d0d25c0ca20b6048aa7a1
-https://github.com/google/gnxi.git==f34a75d41930dc645a2fb6b93bad1fa69a82338d
+https://github.com/google/gnxi.git==612869a62faaaf2956ed60296ad801513ab62d29
 https://github.com/jeroennijhof/pam_tacplus.git==b839c440e33c36eced9dcbc287fcfe6237c4c4ce
-https://github.com/karimra/gnoic.git==57aac3de930960cc90bb32692c7d34149d59c188
+https://github.com/karimra/gnoic.git==2b416818af4946eecc3adc199713f20f39710f40
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
 https://github.com/openconfig/oc-pyang.git==4607fd1987d4f586aba03b40f222015cb3ef8161
-https://github.com/p4lang/ptf.git==6af750831ffe14512c5195383f2b39691744503e
-https://github.com/redis/librdb.git==b0e6b98f5da7864c2669cbffa747ec652b57a155
-https://github.com/sflow/host-sflow==cc127965d2e24d2857ec0bcca2b34ffcf499ec19
-https://github.com/sflow/sflowtool==45fe9276d10f6af6f3cc1cf6ba93da9151e2b9bf
-https://github.com/sonic-net/DASH.git==57e599c9d8e1f538ea01fad28781d8a0c2706ba5
-https://salsa.debian.org/kernel-team/initramfs-tools.git==e29f76a13e9cc06103caacce25a0be6ac2624ab6
+https://github.com/p4lang/ptf.git==05f46c3873feb2213df29743be3d9a9e34d5559b
+https://github.com/redis/librdb.git==089d318e74cbefa9c42147afd8534e5677c259a5
+https://github.com/sflow/host-sflow==da3fba254adc17cd62f4c0d4123a7767cd808dfe
+https://github.com/sflow/sflowtool==c4213f2ea91773b80628b1bebb9cd08bdec6612b
+https://github.com/sonic-net/DASH.git==8377343f3cd1af9af6eb34fd9d310b6aa2ad667f
+https://salsa.debian.org/kernel-team/initramfs-tools.git==8c65a4965ee3529288c88565c7715692bfcd3422
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
 https://salsa.debian.org/tai271828/rasdaemon.git==51a7f485f8b2e2ae43e613f19c5a387595174132

files/build/versions/default/versions-mirror

@@ -1,28 +1,25 @@
 archive.ubuntu.com_ubuntu_dists_focal==2020-04-23T17:33:17Z
-archive.ubuntu.com_ubuntu_dists_focal-backports==2025-07-06T03:30:17Z
-archive.ubuntu.com_ubuntu_dists_focal-updates==2025-07-06T04:50:27Z
-deb.debian.org_debian-security_dists_bookworm-security==2025-07-04T19:24:54Z
-deb.debian.org_debian_dists_bookworm==2025-05-17T09:13:04Z
-deb.debian.org_debian_dists_bookworm-backports==2025-07-06T02:09:02Z
-deb.debian.org_debian_dists_bookworm-updates==2025-07-06T02:09:02Z
+archive.ubuntu.com_ubuntu_dists_focal-backports==2025-12-18T20:48:26Z
+archive.ubuntu.com_ubuntu_dists_focal-updates==2025-12-19T00:06:58Z
+deb.debian.org_debian-security_dists_bookworm-security==2025-12-18T23:03:11Z
+deb.debian.org_debian_dists_bookworm==2025-09-06T11:02:45Z
+deb.debian.org_debian_dists_bookworm-backports==2025-12-18T20:16:52Z
+deb.debian.org_debian_dists_bookworm-updates==2025-12-18T20:16:52Z
 deb.nodesource.com_node%5f14.x_dists_bookworm==2023-02-17T00:35:29Z
-deb.nodesource.com_node%5f14.x_dists_bullseye==2023-02-17T00:35:28Z
-deb.nodesource.com_node%5f14.x_dists_buster==2023-02-17T00:35:28Z
-debian==20251014T002409Z
-debian-security==20251014T002334Z
-download.docker.com_linux_debian_dists_bookworm==2025-07-02T22:46:33Z
-download.docker.com_linux_debian_dists_bullseye==2025-07-02T22:46:33Z
+debian==20251218T001426Z
+debian-security==20251218T001422Z
+download.docker.com_linux_debian_dists_bookworm==2025-12-18T19:08:07Z
 download.docker.com_linux_debian_dists_buster==2024-06-17T16:53:50Z
-packages.trafficmanager.net_snapshot_debian-security_20251014T002334Z_dists_bookworm-security==2025-07-03T18:17:33Z
-packages.trafficmanager.net_snapshot_debian-security_20251014T002334Z_dists_bullseye-security==2025-07-03T18:17:33Z
-packages.trafficmanager.net_snapshot_debian-security_20251014T002334Z_dists_buster_updates==2024-12-29T19:56:34Z
-packages.trafficmanager.net_snapshot_debian_20251014T002409Z_dists_bookworm==2025-05-17T09:13:04Z
-packages.trafficmanager.net_snapshot_debian_20251014T002409Z_dists_bookworm-backports==2025-07-04T20:14:36Z
-packages.trafficmanager.net_snapshot_debian_20251014T002409Z_dists_bookworm-updates==2025-07-04T20:14:36Z
-packages.trafficmanager.net_snapshot_debian_20251014T002409Z_dists_bullseye==2024-08-31T11:02:15Z
-packages.trafficmanager.net_snapshot_debian_20251014T002409Z_dists_bullseye-backports==2025-07-04T20:14:36Z
-packages.trafficmanager.net_snapshot_debian_20251014T002409Z_dists_bullseye-updates==2025-07-04T20:14:36Z
-packages.trafficmanager.net_snapshot_debian_20251014T002409Z_dists_buster==2023-06-10T08:53:33Z
-packages.trafficmanager.net_snapshot_debian_20251014T002409Z_dists_buster-backports==2024-03-09T20:54:54Z
-packages.trafficmanager.net_snapshot_debian_20251014T002409Z_dists_buster-updates==2023-06-10T08:55:10Z
-security.ubuntu.com_ubuntu_dists_focal-security==2025-07-06T03:22:56Z
+packages.trafficmanager.net_snapshot_debian-security_20251218T001422Z_dists_bookworm-security==2025-12-16T11:23:01Z
+packages.trafficmanager.net_snapshot_debian-security_20251218T001422Z_dists_bullseye-security==2025-12-16T11:23:02Z
+packages.trafficmanager.net_snapshot_debian-security_20251218T001422Z_dists_buster_updates==2024-12-29T19:56:34Z
+packages.trafficmanager.net_snapshot_debian_20251218T001426Z_dists_bookworm==2025-09-06T11:02:45Z
+packages.trafficmanager.net_snapshot_debian_20251218T001426Z_dists_bookworm-backports==2025-12-17T20:21:27Z
+packages.trafficmanager.net_snapshot_debian_20251218T001426Z_dists_bookworm-updates==2025-12-17T20:21:27Z
+packages.trafficmanager.net_snapshot_debian_20251218T001426Z_dists_bullseye==2025-08-09T09:16:30Z
+packages.trafficmanager.net_snapshot_debian_20251218T001426Z_dists_bullseye-backports==2025-07-21T20:10:09Z
+packages.trafficmanager.net_snapshot_debian_20251218T001426Z_dists_bullseye-updates==2025-08-09T08:55:05Z
+packages.trafficmanager.net_snapshot_debian_20251218T001426Z_dists_buster==2023-06-10T08:53:33Z
+packages.trafficmanager.net_snapshot_debian_20251218T001426Z_dists_buster-backports==2024-03-09T20:54:54Z
+packages.trafficmanager.net_snapshot_debian_20251218T001426Z_dists_buster-updates==2023-06-10T08:55:10Z
+security.ubuntu.com_ubuntu_dists_focal-security==2025-12-18T20:39:15Z