Merge pull request sonic-net#163 from oleksandrivantsiv/bluefield

Merge remote-tracking branch 'upstream/master' into bluefield. Update submodules.

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

@@ -167,6 +167,12 @@ jobs:
                 git stash
                 popd
               fi
+              if [ $(GROUP_NAME) == barefoot ]; then
+                make $BUILD_OPTIONS SAITHRIFT_V2=y ENABLE_SYNCD_RPC=y target/docker-saiserverv2-bfn.gz
+                pushd ./src/sonic-sairedis/SAI
+                git stash
+                popd
+              fi
             fi
             if [ $(syncd_rpc_image) == yes ]; then
               make $BUILD_OPTIONS ENABLE_SYNCD_RPC=y target/sonic-$(GROUP_NAME).bin

.azure-pipelines/build-template.yml

@@ -118,6 +118,12 @@ jobs:
             git stash
             popd 
           fi
+          if [ ${{ parameters.platform }} == barefoot ]; then
+            make USERNAME=admin $CACHE_OPTIONS SONIC_BUILD_JOBS=$(nproc) SAITHRIFT_V2=y  ENABLE_SYNCD_RPC=y  target/docker-saiserverv2-bfn.gz
+            pushd ./src/sonic-sairedis/SAI
+            git stash
+            popd 
+          fi
         fi
 
         make USERNAME=admin $CACHE_OPTIONS SONIC_BUILD_JOBS=$(nproc) target/sonic-${{ parameters.platform }}.bin

.azure-pipelines/docker-sonic-mgmt.yml

@@ -32,17 +32,18 @@ stages:
 - stage: Build
   jobs:
   - job: Build
-    pool: sonictest
+    pool: sonicbld
     timeoutInMinutes: 360
     steps:
     - template: cleanup.yml
     - checkout: self
       clean: true
-      submodules: recursive
     - bash: |
         set -xe
-        make configure PLATFORM=generic
-        make target/docker-sonic-mgmt.gz
+        git submodule update --init --recursive -- src/sonic-platform-daemons src/sonic-genl-packet src/sonic-sairedis src/ptf src/sonic-device-data
+
+        make SONIC_BUILD_JOBS=$(nproc) DEFAULT_CONTAINER_REGISTRY=publicmirror.azurecr.io ENABLE_DOCKER_BASE_PULL=y configure PLATFORM=generic
+        make SONIC_BUILD_JOBS=$(nproc) DEFAULT_CONTAINER_REGISTRY=publicmirror.azurecr.io ENABLE_DOCKER_BASE_PULL=y target/docker-sonic-mgmt.gz
         cp target -r $(Build.ArtifactStagingDirectory)/target
         docker load -i target/docker-sonic-mgmt.gz
         docker tag docker-sonic-mgmt $REGISTRY_SERVER/docker-sonic-mgmt:latest

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

@@ -53,7 +53,8 @@ jobs:
       containerRegistry: ${{ parameters.registry_conn }}
   - bash: |
       set -ex
-      image_tag=$(BLDENV=${{ parameters.dist }} make -f Makefile.work showtag PLATFORM=generic PLATFORM_ARCH=${{ parameters.arch }} | grep sonic-slave | tail -n 1)
+      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 }}:/')
@@ -65,7 +66,7 @@ jobs:
         exit 0
       fi
 
-      DOCKER_DATA_ROOT_FOR_MULTIARCH=/data/march/docker BLDENV=${{ parameters.dist }} make -f Makefile.work configure PLATFORM=generic PLATFORM_ARCH=${{ parameters.arch }} $args || docker image ls $image_tag
+      DOCKER_DATA_ROOT_FOR_MULTIARCH=/data/march/docker BLDENV=${{ parameters.dist }} make -f Makefile.work configure $build_options PLATFORM=generic PLATFORM_ARCH=${{ parameters.arch }} $args || docker image ls $image_tag
       if [[ "$(Build.Reason)" == "PullRequest" ]];then
         exit 0
       fi

.azure-pipelines/run-test-scheduler-template.yml

@@ -81,7 +81,7 @@ steps:
       echo "TestbedV2 is just online and might not be stable enough, for any issue, please send email to [email protected]"
       echo "Runtime detailed progress at https://www.testbed-tools.org/scheduler/testplan/$TEST_PLAN_ID"
       # When "LOCK_TESTBED" finish, it changes into "PREPARE_TESTBED"
-      python ./.azure-pipelines/test_plan.py poll -i "$(TEST_PLAN_ID)" --expected-states PREPARE_TESTBED EXECUTING KVMDUMP FINISHED CANCELLED FAILED
+      python ./.azure-pipelines/test_plan.py poll -i "$(TEST_PLAN_ID)" --expected-state LOCK_TESTBED
     env:
       TESTBED_TOOLS_URL: $(TESTBED_TOOLS_URL)
     displayName: Lock testbed
@@ -94,7 +94,7 @@ steps:
       echo "TestbedV2 is just online and might not be stable enough, for any issue, please send email to [email protected]"
       echo "Runtime detailed progress at https://www.testbed-tools.org/scheduler/testplan/$TEST_PLAN_ID"
       # When "PREPARE_TESTBED" finish, it changes into "EXECUTING"
-      python ./.azure-pipelines/test_plan.py poll -i "$(TEST_PLAN_ID)" --expected-states EXECUTING KVMDUMP FINISHED CANCELLED FAILED
+      python ./.azure-pipelines/test_plan.py poll -i "$(TEST_PLAN_ID)" --expected-state PREPARE_TESTBED
     env:
       TESTBED_TOOLS_URL: $(TESTBED_TOOLS_URL)
     displayName: Prepare testbed
@@ -105,7 +105,7 @@ steps:
       echo "TestbedV2 is just online and might not be stable enough, for any issue, please send email to [email protected]"
       echo "Runtime detailed progress at https://www.testbed-tools.org/scheduler/testplan/$TEST_PLAN_ID"
       # When "EXECUTING" finish, it changes into "KVMDUMP", "FAILED", "CANCELLED" or "FINISHED"
-      python ./.azure-pipelines/test_plan.py poll -i "$(TEST_PLAN_ID)" --expected-states KVMDUMP FINISHED CANCELLED FAILED
+      python ./.azure-pipelines/test_plan.py poll -i "$(TEST_PLAN_ID)" --expected-state EXECUTING
     env:
       TESTBED_TOOLS_URL: $(TESTBED_TOOLS_URL)
     displayName: Run test
@@ -116,7 +116,7 @@ steps:
       echo "TestbedV2 is just online and might not be stable enough, for any issue, please send email to [email protected]"
       echo "Runtime detailed progress at https://www.testbed-tools.org/scheduler/testplan/$TEST_PLAN_ID"
       # When "KVMDUMP" finish, it changes into "FAILED", "CANCELLED" or "FINISHED"
-      python ./.azure-pipelines/test_plan.py poll -i "$(TEST_PLAN_ID)" --expected-states FINISHED CANCELLED FAILED
+      python ./.azure-pipelines/test_plan.py poll -i "$(TEST_PLAN_ID)" --expected-state KVMDUMP
     condition: succeededOrFailed()
     env:
       TESTBED_TOOLS_URL: $(TESTBED_TOOLS_URL)

.azure-pipelines/template-variables.yml

@@ -4,3 +4,4 @@ variables:
   SONIC_SLAVE_DOCKER_DRIVER: 'overlay2'
   SONIC_BUILD_RETRY_COUNT: 3
   SONIC_BUILD_RETRY_INTERVAL: 600
+  DOCKER_BUILDKIT: 0

.github/CODEOWNERS

@@ -19,9 +19,9 @@
 /Makefile.work  @qiluo-msft @xumia @lguohan
 /slave.mk       @qiluo-msft @xumia @lguohan
 /scripts        @qiluo-msft @xumia @lguohan
-/src/sonic-build-hooks/                 @Azure/sonic-build
-/src/debootstrap/                       @Azure/sonic-build
-/src/sonic-fips/                        @Azure/sonic-build
+/src/sonic-build-hooks/                 @sonic-net/sonic-build
+/src/debootstrap/                       @sonic-net/sonic-build
+/src/sonic-fips/                        @sonic-net/sonic-build
 
 # installer
 /installer/     @qiluo-msft
@@ -35,76 +35,77 @@
 /dockers/docker-snmp/                   @qiluo-msft
 
 # kernel
-/src/sonic-linux-kernel/                @Azure/sonic-kernel
+/src/sonic-linux-kernel/                @sonic-net/sonic-kernel
 
 # devices
-/device/                                @Azure/sonic-platform
-/src/sonic-platform-common/             @Azure/sonic-platform
-/src/sonic-platform-daemons/            @Azure/sonic-platform
-/src/sonic-platform-pde/                @Azure/sonic-platform
-/src/lm-sensors/                        @Azure/sonic-platform
-/src/flashrom/                          @Azure/sonic-platform
+/device/                                @sonic-net/sonic-platform
+/src/sonic-platform-common/             @sonic-net/sonic-platform
+/src/sonic-platform-daemons/            @sonic-net/sonic-platform
+/src/sonic-platform-pde/                @sonic-net/sonic-platform
+/src/lm-sensors/                        @sonic-net/sonic-platform
+/src/flashrom/                          @sonic-net/sonic-platform
 
 # common library
 /src/initramfs-tools/                   @qiluo-msft
-/src/redis-dump-load/                   @Azure/sonic-management
-/src/sonic-py-common/                   @Azure/sonic-management
-/src/sonic-py-swsssdk/                  @Azure/sonic-management
-/src/sonic-swss-common/                 @Azure/sonic-management
-/src/bash/                              @Azure/sonic-management
-/src/tacacs/                            @Azure/sonic-management
-/src/radius/                            @Azure/sonic-management
-/src/swig/                              @Azure/sonic-management
-/src/socat/                             @Azure/sonic-management
+/src/redis-dump-load/                   @sonic-net/sonic-management
+/src/sonic-py-common/                   @sonic-net/sonic-management
+/src/sonic-py-swsssdk/                  @sonic-net/sonic-management
+/src/sonic-swss-common/                 @sonic-net/sonic-management
+/src/bash/                              @sonic-net/sonic-management
+/src/tacacs/                            @sonic-net/sonic-management
+/src/radius/                            @sonic-net/sonic-management
+/src/swig/                              @sonic-net/sonic-management
+/src/socat/                             @sonic-net/sonic-management
 
 # redis
-/src/redis/                             @Azure/sonic-management
-/src/hiredis/                           @Azure/sonic-management
+/src/redis/                             @sonic-net/sonic-management
+/src/hiredis/                           @sonic-net/sonic-management
 
 # yang
 /src/sonic-yang-models/                 @praveen-li @dgsudharsan @rathnasabapathyv @venkatmahalingam @qiluo-msft
-/src/sonic-yang-mgmt/                   @Azure/sonic-management
-/src/libyang/                           @Azure/sonic-management
-/src/libyang1/                          @Azure/sonic-management
-/src/libyang2/                          @Azure/sonic-management
+/src/sonic-yang-mgmt/                   @sonet-net/sonic-management
+/src/libyang/                           @sonic-net/sonic-management
+/src/libyang1/                          @sonic-net/sonic-management
+/src/libyang2/                          @sonic-net/sonic-management
 
 # bgpcfgd
 /src/sonic-bgpcfgd/                     @StormLiangMS
 
 # sonic-config-engine
-/src/sonic-config-engine/               @Azure/sonic-management
+/src/sonic-config-engine/               @sonic-net/sonic-management
 
 # sonic-utilities
-/src/sonic-utilities/                   @Azure/sonic-management
+/src/sonic-utilities/                   @sonic-net/sonic-management
 
 # sonic-telemetry
-/src/sonic-telemetry/                   @Azure/sonic-management
+/dockers/docker-sonic-telemetry         @sonic-net/sonic-management
+/src/sonic-telemetry/                   @sonic-net/sonic-management
 
 # snmp
-/src/sonic-snmpagent/                   @Azure/sonic-management
-/src/snmpd/                             @Azure/sonic-management
+/src/sonic-snmpagent/                   @sonic-net/sonic-management
+/src/snmpd/                             @sonic-net/sonic-management
 
 # dhcp relay
-/src/dhcp6relay/                        @Azure/sonic-fundamentals
-/src/dhcpmon/                           @Azure/sonic-fundamentals
-/src/isc-dhcp/                          @Azure/sonic-fundamentals
+/src/dhcp6relay/                        @sonic-net/sonic-fundamentals
+/src/dhcpmon/                           @sonic-net/sonic-fundamentals
+/src/isc-dhcp/                          @sonic-net/sonic-fundamentals
 
 # sflow
-/src/sflow/                             @Azure/sonic-dataplane
+/src/sflow/                             @sonic-net/sonic-dataplane
 
 # sonic restapi
-/src/sonic-restapi/                     @Azure/sonic-dataplane
+/src/sonic-restapi/                     @sonic-net/sonic-dataplane
 
 # sonic swss
-/src/sonic-swss/                        @Azure/sonic-dataplane
+/src/sonic-swss/                        @sonic-net/sonic-dataplane
 
 # linux networking, e.g., libnl3, iproute2, ifupdown2, ethtool
-/src/libnl3/                            @Azure/sonic-dataplane
-/src/iproute2/                          @Azure/sonic-dataplane
-/src/ifupdown2/                         @Azure/sonic-dataplane
-/src/ethtool/                           @Azure/sonic-dataplane
+/src/libnl3/                            @sonic-net/sonic-dataplane
+/src/iproute2/                          @sonic-net/sonic-dataplane
+/src/ifupdown2/                         @sonic-net/sonic-dataplane
+/src/ethtool/                           @sonic-net/sonic-dataplane
 
 # ptf
-/src/ptf/                               @Azure/sonic-fundamentals
-/src/ptf-py3/                           @Azure/sonic-fundamentals
-/src/scapy/                             @Azure/sonic-fundamentals
+/src/ptf/                               @sonic-net/sonic-fundamentals
+/src/ptf-py3/                           @sonic-net/sonic-fundamentals
+/src/scapy/                             @sonic-net/sonic-fundamentals

.github/workflows/automerge_scan.yml

@@ -6,6 +6,7 @@ on:
 
 jobs:
   automerge_scan:
+    if: github.repository_owner == 'sonic-net'
     runs-on: ubuntu-latest
     steps:
     - name: Debug

.github/workflows/codeql-analysis.yml

@@ -14,6 +14,7 @@ on:
 
 jobs:
   analyze:
+    if: github.repository_owner == 'sonic-net'
     name: Analyze
     runs-on: ubuntu-latest
     permissions:

.github/workflows/label.yml

@@ -20,6 +20,7 @@ on:
 
 jobs:
   label:
+    if: github.repository_owner == 'sonic-net'
     runs-on: ubuntu-latest
     steps:
     - uses: actions/labeler@main

.github/workflows/pr_cherrypick_poststep.yml

@@ -46,4 +46,4 @@ jobs:
           exit 1
         fi
         gh pr edit $origin_pr_url --add-label "Included in ${base_ref} Branch"
-        gh pr edit $origin_pr_url --remove-label "Created PR to ${base_ref} Branch,Approved for ${base_ref} Branch"
+        gh pr edit $origin_pr_url --remove-label "Created PR to ${base_ref} Branch"

.github/workflows/semgrep.yml

@@ -10,6 +10,7 @@ on:
 
 jobs:
   semgrep:
+    if: github.repository_owner == 'sonic-net'
     name: Semgrep
     runs-on: ubuntu-latest
     container:

Makefile.work

@@ -182,11 +182,23 @@ ifeq ($(ENABLE_FIPS), y)
 endif
 endif
 
+SONIC_VERSION_CACHE := $(filter-out none,$(SONIC_VERSION_CACHE_METHOD))
+SONIC_OVERRIDE_BUILD_VARS += SONIC_VERSION_CACHE=$(SONIC_VERSION_CACHE)
+SONIC_OVERRIDE_BUILD_VARS += SONIC_VERSION_CACHE_SOURCE=$(SONIC_VERSION_CACHE_SOURCE)
+export SONIC_VERSION_CACHE SONIC_VERSION_CACHE_SOURCE
+$(shell test -d $(SONIC_VERSION_CACHE_SOURCE) || \
+    mkdir -p $(SONIC_VERSION_CACHE_SOURCE) && chmod -f 777 $(SONIC_VERSION_CACHE_SOURCE) 2>/dev/null )
+
 # Generate the version control build info
 $(shell \
 	SONIC_VERSION_CONTROL_COMPONENTS=$(SONIC_VERSION_CONTROL_COMPONENTS) \
 	TRUSTED_GPG_URLS=$(TRUSTED_GPG_URLS) \
 	PACKAGE_URL_PREFIX=$(PACKAGE_URL_PREFIX) \
+	DISTRO=$(BLDENV) \
+	SONIC_VERSION_CACHE=$(SONIC_VERSION_CACHE) \
+	SONIC_VERSION_CACHE_SOURCE=$(SONIC_VERSION_CACHE_SOURCE) \
+	DBGOPT='$(DBGOPT)' \
+	MIRROR_SNAPSHOT=$(MIRROR_SNAPSHOT) \
 	scripts/generate_buildinfo_config.sh)
 
 # Generate the slave Dockerfile, and prepare build info for it
@@ -206,6 +218,8 @@ $(shell CONFIGURED_ARCH=$(CONFIGURED_ARCH) \
 
 PREPARE_DOCKER=BUILD_SLAVE=y \
 	DEFAULT_CONTAINER_REGISTRY=$(DEFAULT_CONTAINER_REGISTRY) \
+	SONIC_VERSION_CACHE=$(SONIC_VERSION_CACHE) \
+	DBGOPT='$(DBGOPT)' \
 	scripts/prepare_docker_buildinfo.sh \
 		$(SLAVE_BASE_IMAGE) \
 		$(SLAVE_DIR)/Dockerfile \
@@ -228,12 +242,13 @@ SLAVE_TAG = $(shell \
 	(cat $(SLAVE_DIR)/Dockerfile.user \
 		 $(SLAVE_DIR)/Dockerfile \
 		 $(SLAVE_DIR)/buildinfo/versions/versions-* \
-		 .git/HEAD \
 	&& echo $(USER)/$(PWD)/$(CONFIGURED_PLATFORM)) \
 	| sha1sum \
 	| awk '{print substr($$1,0,11);}')
 
 COLLECT_DOCKER=DEFAULT_CONTAINER_REGISTRY=$(DEFAULT_CONTAINER_REGISTRY) \
+	SONIC_VERSION_CACHE=$(SONIC_VERSION_CACHE) \
+	DBGOPT='$(DBGOPT)' \
 	scripts/collect_docker_version_files.sh \
 		$(SLAVE_BASE_IMAGE) \
 		target \
@@ -294,6 +309,10 @@ ifneq ($(SONIC_DPKG_CACHE_SOURCE),)
 	DOCKER_RUN += -v "$(SONIC_DPKG_CACHE_SOURCE):/dpkg_cache:rw"
 endif
 
+ifneq ($(SONIC_VERSION_CACHE_SOURCE),)
+	DOCKER_RUN += -v "$(SONIC_VERSION_CACHE_SOURCE):/vcache:rw"
+endif
+
 ifeq ($(SONIC_ENABLE_SECUREBOOT_SIGNATURE), y)
 ifneq ($(SIGNING_KEY),)
 	DOCKER_SIGNING_SOURCE := $(shell dirname $(SIGNING_KEY))
@@ -341,27 +360,27 @@ ifeq ($(DOCKER_DATA_ROOT_FOR_MULTIARCH),)
 endif
     # Multiarch docker cannot start dockerd service due to iptables cannot run over different arch kernel
     SONIC_SERVICE_DOCKERD_FOR_MULTIARCH=y
-    SONIC_NATIVE_DOCKERD_FOR_MUTLIARCH := dockerd  --experimental=true --storage-driver=vfs \
+    SONIC_NATIVE_DOCKERD_FOR_MULTIARCH := dockerd  --experimental=true --storage-driver=vfs \
         --data-root=$(DOCKER_DATA_ROOT_FOR_MULTIARCH) --exec-root=/var/run/march/docker/ \
         -H unix:///var/run/march/docker.sock -p /var/run/march/docker.pid
 
 ifneq ($(DOCKER_CONFIG_FILE_FOR_MULTIARCH),)
-    SONIC_NATIVE_DOCKERD_FOR_MUTLIARCH += --config-file=$(DOCKER_CONFIG_FILE_FOR_MULTIARCH)
+    SONIC_NATIVE_DOCKERD_FOR_MULTIARCH += --config-file=$(DOCKER_CONFIG_FILE_FOR_MULTIARCH)
 endif
 
     DOCKER_RUN += -v /var/run/march/docker.sock:/var/run/docker.sock
     DOCKER_RUN += -v /var/run/march/docker.pid:/var/run/docker.pid
     DOCKER_RUN += -v /var/run/march/docker:/var/run/docker
     DOCKER_RUN += -v $(DOCKER_DATA_ROOT_FOR_MULTIARCH):/var/lib/docker
-    SONIC_USERFACL_DOCKERD_FOR_MUTLIARCH := setfacl -m user:$(USER):rw /var/run/march/docker.sock
+    SONIC_USERFACL_DOCKERD_FOR_MULTIARCH := setfacl -m user:$(USER):rw /var/run/march/docker.sock
 
     #Override Native config to prevent docker service
     SONIC_CONFIG_USE_NATIVE_DOCKERD_FOR_BUILD=y
 
     DOCKER_MULTIARCH_CHECK := docker run --rm --privileged multiarch/qemu-user-static --reset -p yes --credential yes
 
     DOCKER_SERVICE_SAFE_KILLER :=  (MARCH_PID=`ps -eo pid,cmd | grep "[0-9] dockerd.*march" | awk '{print $$1}'`; echo "Killing march docker $$MARCH_PID"; [ -z "$$MARCH_PID" ] || sudo kill -9 "$$MARCH_PID";)
-    DOCKER_SERVICE_MULTIARCH_CHECK := ($(DOCKER_SERVICE_SAFE_KILLER); sudo rm -fr /var/run/march/; (echo "Starting docker march service..."; sudo $(SONIC_NATIVE_DOCKERD_FOR_MUTLIARCH) &) &>/dev/null ; sleep 2; sudo $(SONIC_USERFACL_DOCKERD_FOR_MUTLIARCH);)
+    DOCKER_SERVICE_MULTIARCH_CHECK := ($(DOCKER_SERVICE_SAFE_KILLER); sudo rm -fr /var/run/march/; (echo "Starting docker march service..."; sudo $(SONIC_NATIVE_DOCKERD_FOR_MULTIARCH) &) &>/dev/null ; sleep 2; sudo $(SONIC_USERFACL_DOCKERD_FOR_MULTIARCH);)
 
     # Docker service to load the compiled dockers-*.gz
     # docker 19.0 version above has path/length restriction, so replaced it with soft link in /tmp/
@@ -387,6 +406,8 @@ DOCKER_SLAVE_BASE_BUILD = docker build --no-cache \
 		    --build-arg http_proxy=$(http_proxy) \
 		    --build-arg https_proxy=$(https_proxy) \
 		    --build-arg no_proxy=$(no_proxy) \
+		    --build-arg SONIC_VERSION_CACHE=$(SONIC_VERSION_CACHE) \
+		    --build-arg SONIC_VERSION_CONTROL_COMPONENTS=$(SONIC_VERSION_CONTROL_COMPONENTS) \
 		    $(SLAVE_DIR) \
 		    $(SPLIT_LOG) $(DOCKER_BASE_LOG)
 
@@ -465,7 +486,6 @@ SONIC_BUILD_INSTRUCTION :=  $(MAKE) \
                            SHUTDOWN_BGP_ON_START=$(SHUTDOWN_BGP_ON_START) \
                            INCLUDE_KUBERNETES=$(INCLUDE_KUBERNETES) \
                            KUBERNETES_VERSION=$(KUBERNETES_VERSION) \
-                           KUBERNETES_CNI_VERSION=$(KUBERNETES_CNI_VERSION) \
                            K8s_GCR_IO_PAUSE_VERSION=$(K8s_GCR_IO_PAUSE_VERSION) \
                            INCLUDE_KUBERNETES_MASTER=$(INCLUDE_KUBERNETES_MASTER) \
                            SONIC_ENABLE_PFCWD_ON_START=$(ENABLE_PFCWD_ON_START) \
@@ -516,6 +536,7 @@ SONIC_BUILD_INSTRUCTION :=  $(MAKE) \
                            MIRROR_URLS=$(MIRROR_URLS) \
                            MIRROR_SECURITY_URLS=$(MIRROR_SECURITY_URLS) \
                            GZ_COMPRESS_PROGRAM=$(GZ_COMPRESS_PROGRAM) \
+                           MIRROR_SNAPSHOT=$(MIRROR_SNAPSHOT) \
                            $(SONIC_OVERRIDE_BUILD_VARS)
 
 .PHONY: sonic-slave-build sonic-slave-bash init reset