diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 12b471137bc..8a4178bca5b 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -35,11 +35,9 @@ stages: sudo modprobe overlay CACHE_OPTIONS="SONIC_DPKG_CACHE_METHOD=rcache SONIC_DPKG_CACHE_SOURCE=/nfs/dpkg_cache/broadcom" ENABLE_DOCKER_BASE_PULL=y make configure PLATFORM=broadcom + trap "sudo rm -rf fsroot" EXIT make USERNAME=admin SONIC_BUILD_JOBS=$(nproc) $CACHE_OPTIONS target/sonic-broadcom.bin displayName: 'Build sonic image' - - script: | - sudo rm -rf fsroot - displayName: 'Clean up build artifacts' - publish: $(System.DefaultWorkingDirectory)/ artifact: sonic-buildimage.broadcom displayName: "Archive sonic image" @@ -56,11 +54,9 @@ stages: sudo modprobe overlay CACHE_OPTIONS="SONIC_DPKG_CACHE_METHOD=rcache SONIC_DPKG_CACHE_SOURCE=/nfs/dpkg_cache/mellanox" ENABLE_DOCKER_BASE_PULL=y make configure PLATFORM=mellanox + trap "sudo rm -rf fsroot" EXIT make USERNAME=admin SONIC_BUILD_JOBS=$(nproc) $CACHE_OPTIONS target/sonic-mellanox.bin displayName: 'Build sonic image' - - script: | - sudo rm -rf fsroot - displayName: 'Clean up build artifacts' - publish: $(System.DefaultWorkingDirectory)/ artifact: sonic-buildimage.mellanox displayName: "Archive sonic image" @@ -78,12 +74,10 @@ stages: sudo modprobe overlay CACHE_OPTIONS="SONIC_DPKG_CACHE_METHOD=rcache SONIC_DPKG_CACHE_SOURCE=/nfs/dpkg_cache/vs" ENABLE_DOCKER_BASE_PULL=y make configure PLATFORM=vs - make USERNAME=admin SONIC_BUILD_JOBS=$(nproc) $CACHE_OPTIONS target/sonic-vs.img.gz - sudo cp target/sonic-vs.img.gz /nfs/azpl/kvmimage/sonic-vs.$(Build.BuildNumber).img.gz + trap "sudo rm -rf fsroot" EXIT + make USERNAME=admin SONIC_BUILD_JOBS=$(nproc) $CACHE_OPTIONS target/sonic-vs.img.gz && \ + sudo cp target/sonic-vs.img.gz /nfs/azpl/kvmimage/sonic-vs.$(Build.BuildNumber).img.gz displayName: 'Build sonic image' - - script: | - sudo rm -rf fsroot - displayName: 'Clean up build artifacts' - publish: $(System.DefaultWorkingDirectory)/ artifact: sonic-buildimage.kvm displayName: "Archive sonic image" diff --git a/platform/mellanox/mlnx-platform-api/sonic_platform/chassis.py b/platform/mellanox/mlnx-platform-api/sonic_platform/chassis.py index c1d93b8ffda..b5ca79286d1 100644 --- a/platform/mellanox/mlnx-platform-api/sonic_platform/chassis.py +++ b/platform/mellanox/mlnx-platform-api/sonic_platform/chassis.py @@ -113,7 +113,6 @@ def initialize_fan(self): def initialize_sfp(self): from sonic_platform.sfp import SFP - from sonic_platform.sfp import initialize_sdk_handle self.sfp_module = SFP @@ -137,6 +136,7 @@ def initialize_sfp(self): def get_sdk_handle(self): if not self.sdk_handle: + from sonic_platform.sfp import initialize_sdk_handle self.sdk_handle = initialize_sdk_handle() if self.sdk_handle is None: logger.log_error('Failed to open SDK handle') diff --git a/platform/vs/rules.dep b/platform/vs/rules.dep index 7d36c819509..7a5346619e7 100644 --- a/platform/vs/rules.dep +++ b/platform/vs/rules.dep @@ -2,6 +2,7 @@ include $(PLATFORM_PATH)/syncd-vs.dep include $(PLATFORM_PATH)/sonic-version.dep include $(PLATFORM_PATH)/docker-sonic-vs.dep include $(PLATFORM_PATH)/docker-syncd-vs.dep +include $(PLATFORM_PATH)/docker-gbsyncd-vs.dep include $(PLATFORM_PATH)/one-image.dep include $(PLATFORM_PATH)/onie.dep include $(PLATFORM_PATH)/kvm-image.dep diff --git a/rules/functions b/rules/functions index 5ccb111cec7..35b63aeabaf 100644 --- a/rules/functions +++ b/rules/functions @@ -117,6 +117,7 @@ define add_dbg_docker $(2)_PATH = $($(1)_PATH) $(2)_DBG_DEPENDS += $($(1)_DBG_DEPENDS) $(2)_DBG_IMAGE_PACKAGES += $($(1)_DBG_IMAGE_PACKAGES) +$(2)_PYTHON_DEBS += $($(1)_PYTHON_DEBS) $(2)_PYTHON_WHEELS += $($(1)_PYTHON_WHEELS) $(2)_LOAD_DOCKERS += $($(1)_LOAD_DOCKERS) $(2)_CACHE_MODE += $($(1)_CACHE_MODE) diff --git a/rules/sonic-platform-common.dep b/rules/sonic-platform-common.dep index f9324013598..e921c4df01a 100644 --- a/rules/sonic-platform-common.dep +++ b/rules/sonic-platform-common.dep @@ -2,7 +2,7 @@ SPATH := $($(SONIC_PLATFORM_COMMON_PY2)_SRC_PATH) DEP_FILES := $(SONIC_COMMON_FILES_LIST) rules/sonic-platform-common.mk rules/sonic-platform-common.dep DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST) -SMDEP_FILES := $(addprefix $(SPATH)/,$(shell cd $(SPATH) && git ls-files|grep -Ev "sonic_sfp|sonic_eeprom")) +SMDEP_FILES := $(addprefix $(SPATH)/,$(shell cd $(SPATH) && git ls-files|grep -Ev "^sonic_sfp|^sonic_eeprom")) $(SONIC_PLATFORM_COMMON_PY2)_CACHE_MODE := GIT_CONTENT_SHA $(SONIC_PLATFORM_COMMON_PY2)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST) diff --git a/rules/sonic-ztp.dep b/rules/sonic-ztp.dep index 32890c5d74b..bf6622ddb50 100644 --- a/rules/sonic-ztp.dep +++ b/rules/sonic-ztp.dep @@ -2,7 +2,7 @@ SPATH := $($(SONIC_ZTP)_SRC_PATH) DEP_FILES := $(SONIC_COMMON_FILES_LIST) rules/sonic-ztp.mk rules/sonic-ztp.dep DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST) -SMDEP_FILES := $(addprefix $(SPATH)/,$(shell cd $(SPATH) && git ls-files|grep -Ev "inband-ztp-ip|dhclient-exit-hooks.d/ztp")) +SMDEP_FILES := $(addprefix $(SPATH)/,$(shell cd $(SPATH) && git ls-files|grep -Ev "dhclient-enter-hooks.d|dhclient-exit-hooks.d")) $(SONIC_ZTP)_CACHE_MODE := GIT_CONTENT_SHA diff --git a/sonic-slave-buster/Dockerfile.j2 b/sonic-slave-buster/Dockerfile.j2 index f58e0c3ff99..bc6ab531d9c 100644 --- a/sonic-slave-buster/Dockerfile.j2 +++ b/sonic-slave-buster/Dockerfile.j2 @@ -496,7 +496,7 @@ RUN update-alternatives --set iptables /usr/sbin/iptables-legacy RUN pip2 install m2crypto==0.36.0 # Install swi tools -RUN pip2 install git+https://github.com/aristanetworks/swi-tools.git@d51761ec0bb93c73039233f3c01ed48235ffad00 +RUN pip3 install git+https://github.com/aristanetworks/swi-tools.git@bead66bf261770237f7dd21ace3774ba04a017e9 {% if CONFIGURED_ARCH != "amd64" -%} # Install node.js for azure pipeline diff --git a/src/sonic-swss-common b/src/sonic-swss-common index 71dc350d94a..2db7bea9963 160000 --- a/src/sonic-swss-common +++ b/src/sonic-swss-common @@ -1 +1 @@ -Subproject commit 71dc350d94a93a6a13bbcec9d9723809e4d3bae2 +Subproject commit 2db7bea9963a988a575b8075e1f6c5369d057230