Skip to content

Commit bacd215

Browse files
liushilongbuaamssonicbld
liushilongbuaa
authored and
mssonicbld
committed
[ci] Enable cache for marvell-arm64 build in PR checks. (#15449)
Why I did it Enable build cache for marvell-arm64 build to decrease PR check duration. Work item tracking Microsoft ADO (number only): 26340500 How I did it How to verify it
1 parent 491cf9a commit bacd215

11 files changed

+82
-1
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- script: |
3131
[ -n "$OVERRIDE_BUILD_OPTIONS" ] && OVERRIDE_BUILD_OPTIONS=$(OVERRIDE_BUILD_OPTIONS)
3232
BUILD_OPTIONS="$(BUILD_OPTIONS) $OVERRIDE_BUILD_OPTIONS"
33-
if [ -n "$(CACHE_MODE)" ] && echo $(PLATFORM_AZP) | grep -E -q "^(vs|broadcom|mellanox|marvell-armhf)$"; then
33+
if [ -n "$(CACHE_MODE)" ] && echo $(PLATFORM_AZP) | grep -E -q "^(vs|broadcom|mellanox|marvell-armhf|marvell-arm64)$"; then
3434
CACHE_OPTIONS="SONIC_DPKG_CACHE_METHOD=$(CACHE_MODE) SONIC_DPKG_CACHE_SOURCE=/nfs/dpkg_cache/$(PLATFORM_AZP)"
3535
BUILD_OPTIONS="$BUILD_OPTIONS $CACHE_OPTIONS"
3636
fi

‎platform/marvell-arm64/docker-saiserver-mrvl.dep

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
DPATH := $($(DOCKER_SAISERVER_MRVL)_PATH)
2+
DEP_FILES := $(SONIC_COMMON_FILES_LIST) $(PLATFORM_PATH)/docker-saiserver-mrvl.mk $(PLATFORM_PATH)/docker-saiserver-mrvl.dep
3+
DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST)
4+
DEP_FILES += $(shell git ls-files $(DPATH))
5+
6+
$(DOCKER_SAISERVER_MRVL)_CACHE_MODE := GIT_CONTENT_SHA
7+
$(DOCKER_SAISERVER_MRVL)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST)
8+
$(DOCKER_SAISERVER_MRVL)_DEP_FILES := $(DEP_FILES)

‎platform/marvell-arm64/docker-syncd-mrvl-rpc.dep

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
DPATH := $($(DOCKER_SYNCD_MRVL_RPC)_PATH)
2+
DEP_FILES := $(SONIC_COMMON_FILES_LIST) $(PLATFORM_PATH)/docker-syncd-mrvl-rpc.mk $(PLATFORM_PATH)/docker-syncd-mrvl-rpc.dep
3+
DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST)
4+
DEP_FILES += $(shell git ls-files $(DPATH))
5+
6+
$(DOCKER_SYNCD_MRVL_RPC)_CACHE_MODE := GIT_CONTENT_SHA
7+
$(DOCKER_SYNCD_MRVL_RPC)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST)
8+
$(DOCKER_SYNCD_MRVL_RPC)_DEP_FILES := $(DEP_FILES)

‎platform/marvell-arm64/docker-syncd-mrvl.dep

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
DPATH := $($(DOCKER_SYNCD_BASE)_PATH)
2+
DEP_FILES := $(SONIC_COMMON_FILES_LIST) $(PLATFORM_PATH)/docker-syncd-mrvl.mk $(PLATFORM_PATH)/docker-syncd-mrvl.dep $(PLATFORM_PATH)/sai.mk
3+
DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST)
4+
DEP_FILES += $(shell git ls-files $(DPATH))
5+
6+
$(DOCKER_SYNCD_BASE)_CACHE_MODE := GIT_CONTENT_SHA
7+
$(DOCKER_SYNCD_BASE)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST)
8+
$(DOCKER_SYNCD_BASE)_DEP_FILES := $(DEP_FILES)
9+
10+
$(eval $(call add_dbg_docker,$(DOCKER_SYNCD_BASE),$(DOCKER_SYNCD_BASE_DBG)))

‎platform/marvell-arm64/libsaithrift-dev.dep

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
SPATH := $($(LIBSAITHRIFT_DEV)_SRC_PATH)
2+
DEP_FILES := $(SONIC_COMMON_FILES_LIST) $(PLATFORM_PATH)/libsaithrift-dev.mk $(PLATFORM_PATH)/libsaithrift-dev.dep
3+
DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST)
4+
SMDEP_PATHS := $(SPATH) $(SPATH)/bm/behavioral-model $(SPATH)/test/ptf $(SPATH)/test/saithrift/ctypesgen
5+
$(foreach path, $(SMDEP_PATHS), $(eval $(path) :=$(filter-out $(SMDEP_PATHS),$(addprefix $(path)/, $(shell cd $(path) && git ls-files | grep -Ev " " )))))
6+
7+
$(LIBSAITHRIFT_DEV)_CACHE_MODE := GIT_CONTENT_SHA
8+
$(LIBSAITHRIFT_DEV)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST)
9+
$(LIBSAITHRIFT_DEV)_DEP_FILES := $(DEP_FILES)
10+
$(LIBSAITHRIFT_DEV)_SMDEP_FILES := $(foreach path, $(SMDEP_PATHS), $($(path)))
11+
$(LIBSAITHRIFT_DEV)_SMDEP_PATHS := $(SMDEP_PATHS)

‎platform/marvell-arm64/mrvl-prestera.dep

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
MPATH := $($(MRVL_PRESTERA_DEB)_SRC_PATH)
2+
DEP_FILES := $(SONIC_COMMON_FILES_LIST) $(PLATFORM_PATH)/mrvl-prestera.mk $(PLATFORM_PATH)/mrvl-prestera.dep
3+
DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST)
4+
SMDEP_FILES := $(addprefix $(MPATH)/,$(shell cd $(MPATH) && git ls-files))
5+
6+
$(MRVL_PRESTERA_DEB)_CACHE_MODE := GIT_CONTENT_SHA
7+
$(MRVL_PRESTERA_DEB)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST)
8+
$(MRVL_PRESTERA_DEB)_DEP_FILES := $(DEP_FILES)
9+
$(MRVL_PRESTERA_DEB)_SMDEP_FILES := $(SMDEP_FILES)

‎platform/marvell-arm64/one-image.dep

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
$(SONIC_ONE_IMAGE)_CACHE_MODE := none

‎platform/marvell-arm64/platform-marvell.dep

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
MPATH := $($(AC5X_RD98DX35xx_PLATFORM)_SRC_PATH)
2+
DEP_FILES := $(SONIC_COMMON_FILES_LIST) $(PLATFORM_PATH)/platform-marvell.dep $(PLATFORM_PATH)/platform-marvell.mk
3+
DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST)
4+
SMDEP_FILES := $(addprefix $(MPATH)/,$(shell cd $(MPATH) && git ls-files))
5+
6+
$(AC5X_RD98DX35xx_PLATFORM)_CACHE_MODE := GIT_CONTENT_SHA
7+
$(AC5X_RD98DX35xx_PLATFORM)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST)
8+
$(AC5X_RD98DX35xx_PLATFORM)_DEP_FILES := $(DEP_FILES)
9+
$(AC5X_RD98DX35xx_PLATFORM)_SMDEP_FILES := $(SMDEP_FILES)

‎platform/marvell-arm64/platform-nokia.dep

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
MPATH := $($(NOKIA_7215_PLATFORM)_SRC_PATH)
2+
DEP_FILES := $(SONIC_COMMON_FILES_LIST) $(PLATFORM_PATH)/platform-nokia.mk $(PLATFORM_PATH)/platform-nokia.dep
3+
DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST)
4+
DEP_FILES += $(shell git ls-files $(MPATH))
5+
6+
$(NOKIA_7215_PLATFORM)_CACHE_MODE := GIT_CONTENT_SHA
7+
$(NOKIA_7215_PLATFORM)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST)
8+
$(NOKIA_7215_PLATFORM)_DEP_FILES := $(DEP_FILES)

‎platform/marvell-arm64/rules.dep

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
include $(PLATFORM_PATH)/docker-saiserver-mrvl.dep
2+
include $(PLATFORM_PATH)/docker-syncd-mrvl-rpc.dep
3+
include $(PLATFORM_PATH)/docker-syncd-mrvl.dep
4+
include $(PLATFORM_PATH)/libsaithrift-dev.dep
5+
include $(PLATFORM_PATH)/mrvl-prestera.dep
6+
include $(PLATFORM_PATH)/one-image.dep
7+
include $(PLATFORM_PATH)/platform-marvell.dep
8+
include $(PLATFORM_PATH)/platform-nokia.dep
9+
include $(PLATFORM_PATH)/sai.dep

0 commit comments

Comments
 (0)