Merge branch '202012' into as7326_20210427_api2.0_202012br

sonic-net · May 10, 2022 · ba84c90 · ba84c90
2 parents b918b6a + 8970425
commit ba84c90
Show file tree

Hide file tree

Showing 89 changed files with 634 additions and 257 deletions.
diff --git a/.azure-pipelines/azure-pipelines-download-certificate.yml b/.azure-pipelines/azure-pipelines-download-certificate.yml
@@ -0,0 +1,33 @@
+parameters:
+- name: connectionName
+  type: string
+  default: sonic-dev-connection
+- name: kevaultName
+  type: string
+  default: sonic-kv
+- name: certificateName
+  type: string
+  default: sonic-secure-boot
+
+steps:
+- task: AzureKeyVault@2
+  inputs:
+    connectedServiceName: ${{ parameters.connectionName }}
+    keyVaultName: ${{ parameters.kevaultName }}
+    secretsFilter: ${{ parameters.certificateName }}
+
+- script: |
+    set -e
+    TMP_FILE=$(mktemp)
+    echo "$CERTIFICATE" | base64 -d > $TMP_FILE
+    sudo mkdir -p /etc/certificates
+    mkdir -p $(Build.StagingDirectory)/target
+    # Save the public key
+    openssl pkcs12 -in $TMP_FILE -clcerts --nokeys -nodes -passin pass: | sed -z -e "s/.*\(-----BEGIN CERTIFICATE\)/\1/" > $(SIGNING_CERT)
+    # Save the private key
+    openssl pkcs12 -in $TMP_FILE -nocerts -nodes -passin pass: | sed -z -e "s/.*\(-----BEGIN PRIVATE KEY\)/\1/" | sudo tee $(SIGNING_KEY) 1>/dev/null
+    ls -lt $(SIGNING_CERT) $(SIGNING_KEY)
+    rm $TMP_FILE
+  env:
+    CERTIFICATE: $(${{ parameters.certificateName }})
+  displayName: "Save certificate"
diff --git a/.azure-pipelines/azure-pipelines-image-template.yml b/.azure-pipelines/azure-pipelines-image-template.yml
@@ -53,6 +53,10 @@ jobs:
       - publish:  $(Build.ArtifactStagingDirectory)
         artifact: 'sonic-buildimage.$(GROUP_NAME)$(GROUP_EXTNAME)'
         displayName: "Archive sonic image"
+      - publish:  $(Build.ArtifactStagingDirectory)
+        condition: failed()
+        artifact: 'sonic-buildimage.$(GROUP_NAME)$(GROUP_EXTNAME)$(System.JobAttempt)'
+        displayName: "Archive failed sonic image"
       - ${{ parameters.postSteps }}
       - template: cleanup.yml
     jobGroups: ${{ parameters.jobGroups }}

diff --git a/.azure-pipelines/official-build-cisco-8000.yml b/.azure-pipelines/official-build-cisco-8000.yml
@@ -22,10 +22,17 @@ resources:
     name: Cisco-8000-sonic/platform-cisco-8000
     endpoint: cisco-connection
 
+
 variables:
 - group: SONIC-AKV-STROAGE-1
 - name: StorageSASKey
   value: $(sonicstorage-SasToken)
+- name: SONIC_ENABLE_SECUREBOOT_SIGNATURE
+  value: y
+- name: SIGNING_KEY
+  value: /etc/certificates/sonic-secure-boot-private.pem
+- name: SIGNING_CERT
+  value: $(Build.StagingDirectory)/target/sonic-secure-boot-public.pem
 
 stages:
 - stage: Build
@@ -41,6 +48,7 @@ stages:
     parameters:
       buildOptions: 'USERNAME=admin SONIC_BUILD_JOBS=$(nproc) ${{ variables.VERSION_CONTROL_OPTIONS }}'
       preSteps:
+      - template: azure-pipelines-download-certificate.yml
       - checkout: self
         submodules: recursive
         path: s
@@ -90,5 +98,10 @@ stages:
           StorageSASKey: $(StorageSASKey)
         condition: ne(variables['Build.Reason'], 'PullRequest')
         displayName: "Override cisco sai packages"
+      - script: |
+          echo "SONIC_ENABLE_SECUREBOOT_SIGNATURE := y" >> rules/config.user
+          echo "SIGNING_KEY := $(SIGNING_KEY)" >> rules/config.user
+          echo "SIGNING_CERT := $(SIGNING_CERT)" >> rules/config.user
+        displayName: "Enable secure boot signature"
       jobGroups:
       - name: cisco-8000
diff --git a/Makefile.cache b/Makefile.cache
@@ -183,7 +183,7 @@ define GET_MOD_DEP_SHA
 	$(if $($(1)_DEP_FILES_MISSING), $(warning "[ DPKG ] Dependecy file(s) are not found for $(1) : $($(1)_DEP_FILES_MISSING)))
 
 	# Include package dependencies hash values into package hash calculation
-	$(eval $(1)_DEP_PKGS_SHA := $(foreach dfile,$(1)_MOD_DEP_PKGS,$(dfile)_DEP_MOD_SHA $(dfile)_MOD_HASH))
+	$(eval $(1)_DEP_PKGS_SHA := $(foreach dfile,$($(1)_MOD_DEP_PKGS),$($(dfile)_DEP_MOD_SHA) $($(dfile)_MOD_HASH)))
 
 	$(eval $(1)_DEP_MOD_SHA := $(shell bash -c "git hash-object  $($(1)_DEP_MOD_SHA_FILES) && echo $($(1)_DEP_PKGS_SHA)" \
                             | sha1sum | awk '{print substr($$1,0,23);}'))

diff --git a/build_debian.sh b/build_debian.sh
@@ -610,5 +610,5 @@ fi
 pushd $FILESYSTEM_ROOT && sudo tar czf $OLDPWD/$FILESYSTEM_DOCKERFS -C ${DOCKERFS_PATH}var/lib/docker .; popd
 
 ## Compress together with /boot, /var/lib/docker and $PLATFORM_DIR as an installer payload zip file
-pushd $FILESYSTEM_ROOT && sudo zip $OLDPWD/$ONIE_INSTALLER_PAYLOAD -r boot/ $PLATFORM_DIR/; popd
+pushd $FILESYSTEM_ROOT && sudo zip --symlinks $OLDPWD/$ONIE_INSTALLER_PAYLOAD -r boot/ $PLATFORM_DIR/; popd
 sudo zip -g -n .squashfs:.gz $ONIE_INSTALLER_PAYLOAD $FILESYSTEM_SQUASHFS $FILESYSTEM_DOCKERFS
diff --git a/...ista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/td3-a7050cx3-32s-32x100G.config.bcm b/...ista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/td3-a7050cx3-32s-32x100G.config.bcm
@@ -6,6 +6,7 @@ host_as_route_disable=1
 use_all_splithorizon_groups=1
 riot_enable=1
 sai_tunnel_support=1
+sai_tunnel_underlay_route_mode=1
 riot_overlay_l3_intf_mem_size=4096
 riot_overlay_l3_egress_mem_size=32768
 l3_ecmp_levels=2
@@ -52,7 +53,7 @@ stable_size=0x5500000
 tdma_timeout_usec=15000000
 tslam_timeout_usec=15000000
 sai_optimized_mmu=1
-mmu_init_config="TD3-MSFT-T0-100G"
+mmu_init_config="TD3-MSFT-CUSTOM"
 buf.map.egress_pool0.ingress_pool=0
 buf.map.egress_pool1.ingress_pool=0
 buf.map.egress_pool2.ingress_pool=1

diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers_defaults_t0.j2
@@ -11,7 +11,7 @@
 {%- macro generate_buffer_pool_and_profiles() %}
     "BUFFER_POOL": {
         "ingress_lossless_pool": {
-            "size": "32669440",
+            "size": "32689152",
             "type": "ingress",
             "mode": "dynamic",
             "xoff": "2058240"

diff --git a/..._64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/td3-a7050cx3-32s-48x50G+8x100G.config.bcm b/..._64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/td3-a7050cx3-32s-48x50G+8x100G.config.bcm
@@ -6,6 +6,7 @@ host_as_route_disable=1
 use_all_splithorizon_groups=1
 riot_enable=1
 sai_tunnel_support=1
+sai_tunnel_underlay_route_mode=1
 riot_overlay_l3_intf_mem_size=4096
 riot_overlay_l3_egress_mem_size=32768
 l3_ecmp_levels=2
@@ -52,7 +53,7 @@ stable_size=0x5500000
 tdma_timeout_usec=15000000
 tslam_timeout_usec=15000000
 sai_optimized_mmu=1
-mmu_init_config="TD3-MSFT-T0-50G"
+mmu_init_config="TD3-MSFT-CUSTOM"
 buf.map.egress_pool0.ingress_pool=0
 buf.map.egress_pool1.ingress_pool=0
 buf.map.egress_pool2.ingress_pool=1

diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/config.bcm.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/config.bcm.j2
@@ -12,6 +12,7 @@
 {%-         set switch_subtype = DEVICE_METADATA['localhost']['subtype'] -%}
 {%-         if 'dualtor' in switch_subtype.lower() %}
 {%-             set IPinIP_sock = 'sai_tunnel_support=1
+                                   sai_tunnel_underlay_route_mode=1
                                    host_as_route_disable=1
                                    l3_ecmp_levels=2' -%}
 {%-         endif %}

diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/config.bcm.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/config.bcm.j2
@@ -4,6 +4,7 @@
 {%-     set switch_subtype = DEVICE_METADATA['localhost']['subtype'] -%}
 {%-     if 'dualtor' in switch_subtype.lower() %}
 {%-         set IPinIP_sock = 'sai_tunnel_support=1
+                               sai_tunnel_underlay_route_mode=1
                                host_as_route_disable=1
                                l3_ecmp_levels=2' -%}
 {%-     endif %}

diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D96C16/config.bcm.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D96C16/config.bcm.j2
@@ -4,6 +4,7 @@
 {%-     set switch_subtype = DEVICE_METADATA['localhost']['subtype'] -%}
 {%-     if 'dualtor' in switch_subtype.lower() %}
 {%-         set IPinIP_sock = 'sai_tunnel_support=1
+                               sai_tunnel_underlay_route_mode=1
                                host_as_route_disable=1
                                l3_ecmp_levels=2' -%}
 {%-     endif %}

diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/config.bcm.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/config.bcm.j2
@@ -12,6 +12,7 @@
 {%-         set switch_subtype = DEVICE_METADATA['localhost']['subtype'] -%}
 {%-         if 'dualtor' in switch_subtype.lower() %}
 {%-             set IPinIP_sock = 'sai_tunnel_support=1
+                                   sai_tunnel_underlay_route_mode=1
                                    host_as_route_disable=1
                                    l3_ecmp_levels=2' -%}
 {%-         endif %}

diff --git a/...e/celestica/x86_64-cel_e1031-r0/Celestica-E1031-T48S4/helix4-e1031-48x1G+4x10G.config.bcm b/...e/celestica/x86_64-cel_e1031-r0/Celestica-E1031-T48S4/helix4-e1031-48x1G+4x10G.config.bcm
@@ -1,3 +1,7 @@
+sai_postinit_cmd_file=/usr/share/sonic/hwsku/sai_postinit_cmd.soc
+
+ipv6_lpm_128b_enable=1
+
 # disables bcmALPMDH (ALPM distributed hitbit) thread.  This thread is purely for debug purpose
 l3_alpm_hit_skip=1
 

diff --git a/device/celestica/x86_64-cel_e1031-r0/Celestica-E1031-T48S4/sai_postinit_cmd.soc b/device/celestica/x86_64-cel_e1031-r0/Celestica-E1031-T48S4/sai_postinit_cmd.soc
@@ -0,0 +1 @@
+setreg RTAG7_IPV4_TCP_UDP_HASH_FIELD_BMAP_2 IPV4_TCP_UDP_FIELD_BITMAP_A=0xf70
diff --git a/dockers/docker-sonic-telemetry/base_image_files/monit_telemetry b/dockers/docker-sonic-telemetry/base_image_files/monit_telemetry
@@ -2,4 +2,4 @@
 ## Monit configuration for telemetry container
 ###############################################################################
 check program container_memory_telemetry with path "/usr/bin/memory_checker telemetry 419430400"
-    if status == 3 for 10 times within 20 cycles then exec "/usr/bin/restart_service telemetry"
+    if status == 3 for 10 times within 20 cycles then exec "/usr/bin/restart_service telemetry" repeat every 2 cycles
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-git b/files/build/versions/build/build-sonic-slave-buster/versions-git
@@ -1,14 +1,14 @@
-https://github.com/CESNET/libyang.git==a0cc89516ab5eca84d01c85309f320a94752a64c
+https://github.com/CESNET/libyang.git==ab1058892ecdee4ac1742601729b15af286fb95e
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
 https://github.com/jeroennijhof/pam_tacplus.git==b8e07ac27c11b86779ae9698fcafee0c89fc83f5
 https://github.com/jpirko/libteam.git==69a7494bb77dc10bb27076add07b380dbd778592
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
 https://github.com/sflow/host-sflow==2b8771aa7284d3b34cfc43fccba67649d30d0c64
 https://github.com/sflow/sflowtool==4be2a17b36a3b9796c280b117b8b786323a84ae8
-https://github.com/thom311/libnl==855c02f332f0f79f6396318beee00cce7d4bbe4e
+https://github.com/thom311/libnl==2effffe7979dda638108fba26b763fa5acd6edac
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
 https://salsa.debian.org/dhcp-team/isc-dhcp.git==b13135d7f6e61724e7b9a54b53e4e8b916ff21aa
 https://salsa.debian.org/kernel-team/ethtool/==0d5304a5be80cc74bed8ed78002bf5df0d49f412
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
-https://salsa.debian.org/ssh-team/openssh.git==4afc478f0882b4d71e975a3a6814d64797da4621
+https://salsa.debian.org/ssh-team/openssh.git==de790f931452a2dcb4490d074d5a16ab8456a523
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-py3 b/files/build/versions/build/build-sonic-slave-buster/versions-py3
@@ -3,7 +3,7 @@ click==7.0
 docker==5.0.3
 ijson==2.6.1
 ipaddress==1.0.23
-jsondiff==1.3.1
+jsondiff==2.0.0
 jsonschema==2.6.0
 natsort==6.2.1
 netaddr==0.8.0

diff --git a/files/build/versions/default/versions-docker b/files/build/versions/default/versions-docker
@@ -1,10 +1,10 @@
-amd64:amd64/debian:buster==sha256:96cabb5c2fe5309bf5d477ba3e83ba9b716c8bdbf97f3a26817b6a4a8da59a4a
-amd64:amd64/debian:stretch==sha256:54ae51f9db21d4e8d71f2a234fd0180d10dc7c78b76256002d30be3f07453ab9
-amd64:debian:buster==sha256:1b236b48c1ef66fa08535a5153266f4959bf58f948db3e68f7d678b651d8e33a
-amd64:debian:stretch==sha256:a8cc1744bbdd5266678e3e8b3e6387e45c053218438897e86876f2eb104e5534
-arm64:arm64v8/debian:buster==sha256:a6b19c21082133146302e33c31b8aca9c313044b6cfe3dda041867fcd9d86fd9
-arm64:debian:buster==sha256:1b236b48c1ef66fa08535a5153266f4959bf58f948db3e68f7d678b651d8e33a
-arm64:debian:stretch==sha256:a8cc1744bbdd5266678e3e8b3e6387e45c053218438897e86876f2eb104e5534
-armhf:arm32v7/debian:buster==sha256:2aa990397ec8d077cf5bc38ab05991dedb512f334a42366c167e1a5571ffdea1
-armhf:debian:buster==sha256:1b236b48c1ef66fa08535a5153266f4959bf58f948db3e68f7d678b651d8e33a
-armhf:debian:stretch==sha256:a8cc1744bbdd5266678e3e8b3e6387e45c053218438897e86876f2eb104e5534
+amd64:amd64/debian:buster==sha256:40dd1c1b1c36eac161ab63b6ce3a57d56ad79a667a37717a31721bac3f30aaf9
+amd64:amd64/debian:stretch==sha256:75383204de7da8eb4bb2724e5fb8dae2910ee78938ade4d35ed8afec19a90b0b
+amd64:debian:buster==sha256:ebe4b9831fb22dfa778de4ffcb8ea0ad69b5d782d4e86cab14cc1fded5d8e761
+amd64:debian:stretch==sha256:cebe6e1c30384958d471467e231f740e8f0fd92cbfd2a435a186e9bada3aee1c
+arm64:arm64v8/debian:buster==sha256:bf508d976de85857fd69e5da1f67d89f59ab3bc9f60b578ce24eee43047faf23
+arm64:debian:buster==sha256:ebe4b9831fb22dfa778de4ffcb8ea0ad69b5d782d4e86cab14cc1fded5d8e761
+arm64:debian:stretch==sha256:cebe6e1c30384958d471467e231f740e8f0fd92cbfd2a435a186e9bada3aee1c
+armhf:arm32v7/debian:buster==sha256:8e9f24e8010ba995daf25c6fafe8ea5c1914428cc29df867ffc034375d769a43
+armhf:debian:buster==sha256:ebe4b9831fb22dfa778de4ffcb8ea0ad69b5d782d4e86cab14cc1fded5d8e761
+armhf:debian:stretch==sha256:cebe6e1c30384958d471467e231f740e8f0fd92cbfd2a435a186e9bada3aee1c
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
@@ -1,6 +1,6 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==b8a4c0ba657c8fd85e6ca552e210d419a9920f93
-https://github.com/aristanetworks/swi-tools.git==e938746c694e4eaa4cf4126981382c9c8372db24
-https://github.com/CESNET/libyang.git==a0cc89516ab5eca84d01c85309f320a94752a64c
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==87172073a6c87178dca378501fd56c52f6f76a4a
+https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
+https://github.com/CESNET/libyang.git==ab1058892ecdee4ac1742601729b15af286fb95e
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
 https://github.com/dyninc/OpenBFDD.git==e35f43ad8d2b3f084e96a84c392528a90d05a287
 https://github.com/jeroennijhof/pam_tacplus.git==b8e07ac27c11b86779ae9698fcafee0c89fc83f5
@@ -11,10 +11,10 @@ https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74
 https://github.com/p4lang/scapy-vxlan.git==85ffe83da156568ee47a0750f638227e6e1d7479
 https://github.com/sflow/host-sflow==2b8771aa7284d3b34cfc43fccba67649d30d0c64
 https://github.com/sflow/sflowtool==4be2a17b36a3b9796c280b117b8b786323a84ae8
-https://github.com/thom311/libnl==855c02f332f0f79f6396318beee00cce7d4bbe4e
+https://github.com/thom311/libnl==2effffe7979dda638108fba26b763fa5acd6edac
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
 https://salsa.debian.org/dhcp-team/isc-dhcp.git==b13135d7f6e61724e7b9a54b53e4e8b916ff21aa
 https://salsa.debian.org/kernel-team/ethtool/==0d5304a5be80cc74bed8ed78002bf5df0d49f412
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
-https://salsa.debian.org/ssh-team/openssh.git==4afc478f0882b4d71e975a3a6814d64797da4621
+https://salsa.debian.org/ssh-team/openssh.git==de790f931452a2dcb4490d074d5a16ab8456a523
diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
@@ -21,7 +21,7 @@ https://deb.nodesource.com/gpgkey/nodesource.gpg.key==003b51a89a133b5db4cca98b2d
 https://deb.nodesource.com/node_10.x/dists/stretch/Release==22738118af583db3bfad39d6fcb4fa5a
 https://deb.nodesource.com/node_14.x/dists/buster/Release==3084d51335d332e66f0d81a42079516d
 https://deb.nodesource.com/setup_10.x==6742c0148159980e8f6e886df1f8bbe1
-https://deb.nodesource.com/setup_14.x==e678ff76caf1620bc1cc5162517a8f4b
+https://deb.nodesource.com/setup_14.x==88aded33099764ca8f810f72f3c9a173
 https://download.docker.com/linux/debian/gpg==1afae06b34a13c1b3d9cb61a26285a15
 https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnplatform_20220221_sai.1.7.1_deb10.deb==65de37f7834823ba69ab5e55acc5c5f4
 https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnsdk_20220221_sai.1.7.1_deb10.deb==75df8156b85467b501dc67f1914d6ed7
@@ -31,7 +31,7 @@ https://github.com/CumulusNetworks/ifupdown2/archive/1.2.8-1.tar.gz==12f45e90d23
 https://github.com/Innovium/SONiC/raw/master/debian/202012/ipd.deb==d1b2262ddb4171aae2ff3c3e7dbf52f7
 https://github.com/Innovium/SONiC/raw/master/debian/202012/isai.deb==3f495ebff53f8d419a55b6315dfa5200
 https://github.com/Innovium/SONiC/raw/master/debian/202012/saihdr.deb==0f72c8abff5b8ca3f144f7bde88bebc0
-https://github.com/Marvell-switching/sonic-marvell-binaries/raw/master/armhf/sai-plugin/mrvllibsai_1.7.1-7_armhf.deb==385730df69b8d1f9e13d341f78f7b934
+https://github.com/Marvell-switching/sonic-marvell-binaries/raw/master/armhf/sai-plugin/mrvllibsai_1.7.1-8_armhf.deb==74bd3c57609f226ecea5badcb1d55190
 https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz==6f56ef28c93cee644e8c4aaaef7cfb55
 https://github.com/NephosInc/SONiC/raw/master/sai/libsainps-dev_3.0.0_sai_1.5.0_06a67d_amd64.deb==64931041f82533e2a05e003ed9d878c8
 https://github.com/NephosInc/SONiC/raw/master/sai/libsainps_3.0.0_sai_1.5.0_06a67d_amd64.deb==385b84051259ebb2580522a990cca161

diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster
@@ -48,4 +48,4 @@ patch==2.7.6-3+deb10u1
 python3-dev==3.7.3-1
 python3-swsscommon==1.0.0
 python3.7-dev==3.7.3-2+deb10u3
-xz-utils==5.2.4-1
+xz-utils==5.2.4-1+deb10u1
diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-arm64 b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-arm64
@@ -8,5 +8,4 @@ libxml2-dev==2.9.4+dfsg1-7+deb10u3
 libxslt1-dev==1.1.32-2.2~deb10u1
 libxslt1.1==1.1.32-2.2~deb10u1
 pkg-config==0.29-6
-zlib1g==1:1.2.11.dfsg-1+deb10u1
 zlib1g-dev==1:1.2.11.dfsg-1+deb10u1
diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf
@@ -8,5 +8,4 @@ libxml2-dev==2.9.4+dfsg1-7+deb10u3
 libxslt1-dev==1.1.32-2.2~deb10u1
 libxslt1.1==1.1.32-2.2~deb10u1
 pkg-config==0.29-6
-zlib1g==1:1.2.11.dfsg-1+deb10u1
 zlib1g-dev==1:1.2.11.dfsg-1+deb10u1
diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-py3 b/files/build/versions/dockers/docker-config-engine-buster/versions-py3
@@ -8,5 +8,5 @@ pyangbind==0.8.1
 pyyaml==5.4.1
 redis==3.5.3
 redis-dump-load==1.1
-regex==2022.3.15
+regex==2022.4.24
 six==1.16.0
diff --git a/files/build/versions/dockers/docker-config-engine-stretch/versions-deb-stretch b/files/build/versions/dockers/docker-config-engine-stretch/versions-deb-stretch
@@ -43,4 +43,4 @@ patch==2.7.5-1+deb9u2
 python-dev==2.7.13-2
 python-swsscommon==1.0.0
 python2.7-dev==2.7.13-2+deb9u6
-xz-utils==5.2.2-1.2+b1
+xz-utils==5.2.2-1.2+deb9u1
diff --git a/files/build/versions/dockers/docker-orchagent/versions-py3 b/files/build/versions/dockers/docker-orchagent/versions-py3
@@ -1,3 +1,2 @@
 netifaces==0.10.9
-pyroute2==0.5.14
-scapy==2.4.4
+pyroute2==0.5.14
diff --git a/files/build/versions/dockers/docker-ptf/versions-deb-stretch b/files/build/versions/dockers/docker-ptf/versions-deb-stretch
@@ -71,7 +71,7 @@ libfastjson4==0.99.4-1
 libffi-dev==3.2.1-6
 libffi6==3.2.1-6
 libfile-fcntllock-perl==0.22-3+b2
-libfribidi0==0.19.7-1+deb9u1
+libfribidi0==0.19.7-1+deb9u2
 libgc1c2==1:7.4.2-8+deb9u1
 libgcc-6-dev==6.3.0-18+deb9u1
 libgdbm3==1.8.3-14
@@ -169,7 +169,7 @@ libxau6==1:1.0.8-1
 libxcb1==1.12-1
 libxdmcp6==1:1.1.2-3
 libxext6==2:1.3.3-1+b2
-libxml2==2.9.4+dfsg1-2.2+deb9u5
+libxml2==2.9.4+dfsg1-2.2+deb9u6
 libxmuu1==2:1.1.2-2
 linux-libc-dev==4.9.303-1
 logrotate==3.11.0-0.1
@@ -227,7 +227,6 @@ tcpdump==4.9.3-1~deb9u2
 telnet==0.17-41
 tmux==2.3-4
 traceroute==1:2.1.0-2
-tzdata==2021a-0+deb9u3
 ucf==3.0036
 unzip==6.0-21+deb9u2
 vim==2:8.0.0197-4+deb9u5
@@ -238,5 +237,4 @@ xauth==1:1.0.9-1+b2
 xdg-user-dirs==0.15-2+b1
 xml-core==0.17
 xxd==2:8.0.0197-4+deb9u5
-xz-utils==5.2.2-1.2+b1
-zlib1g==1:1.2.8.dfsg-5+deb9u1
+xz-utils==5.2.2-1.2+deb9u1
diff --git a/files/build/versions/dockers/docker-ptf/versions-py2 b/files/build/versions/dockers/docker-ptf/versions-py2
@@ -25,7 +25,7 @@ markupsafe==1.1.1
 netaddr==0.8.0
 nnpy==1.4.2
 oslo.config==2.1.0
-paramiko==2.10.3
+paramiko==2.10.4
 pathlib2==2.3.7.post1
 pbr==2.0.0
 pexpect==4.8.0

diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
@@ -9,18 +9,18 @@ grpcio==1.44.0
 grpcio-tools==1.20.0
 idna==3.3
 importlib-metadata==4.11.3
-importlib-resources==5.6.0
+importlib-resources==5.7.1
 inflection==0.5.1
 itsdangerous==2.1.2
 jsonschema==4.4.0
 openapi-schema-validator==0.2.3
 openapi-spec-validator==0.4.0
-protobuf==3.20.0
+protobuf==3.20.1
 pyrsistent==0.18.1
 python-dateutil==2.6.0
 requests==2.27.1
 six==1.11.0
-typing_extensions==4.1.1
+typing_extensions==4.2.0
 urllib3==1.26.5
 werkzeug==2.1.1
 zipp==3.8.0