From f6098c8c6d98ecc42e9a66711247aaf2c6fc4759 Mon Sep 17 00:00:00 2001 From: xumia <59720581+xumia@users.noreply.github.com> Date: Wed, 16 Jun 2021 10:09:29 +0800 Subject: [PATCH] [build]: Fix missing the depended files of dpkg cache in config engine (#7840) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #### Why I did it The PR checkers do not re-run the sonic-config-engine test cases, caused by some of the config files changes not detected. https://sonic-jenkins.westus2.cloudapp.azure.com/job/mellanox/job/buildimage-mlnx-all/660/console … 07:13:24 ====================================================================== 07:13:24 ERROR: test_bgpd_quagga (tests.test_j2files.TestJ2Files) 07:13:24 ---------------------------------------------------------------------- … 07:13:24 ====================================================================== 07:13:24 ERROR: test_zebra_quagga (tests.test_j2files.TestJ2Files) 07:13:24 ---------------------------------------------------------------------- … 07:13:24 error: Test failed: 07:13:24 [ FAIL LOG END ] [ target/python-wheels/sonic_config_engine-1.0-py2-none-any.whl ] 07:13:24 make: *** [slave.mk:603: target/python-wheels/sonic_config_engine-1.0-py2-none-any.whl] Error 1 07:13:24 Makefile.work:292: recipe for target 'target/sonic-mellanox.bin' failed 07:13:24 make[1]: *** [target/sonic-mellanox.bin] Error 2 07:13:24 make[1]: Leaving directory '/data2/johnar/workspace/mellanox/buildimage-mlnx-all' 07:13:24 Makefile:7: recipe for target 'target/sonic-mellanox.bin' failed 07:13:24 make: *** [target/sonic-mellanox.bin] Error 2 See PR: https://github.com/Azure/sonic-buildimage/pull/7476 #### How I did it Add the depended files. See src/sonic-config-engine/tests/test_j2files.py --- rules/sonic-config.dep | 1 + 1 file changed, 1 insertion(+) diff --git a/rules/sonic-config.dep b/rules/sonic-config.dep index 148e43a96a..61202e5675 100644 --- a/rules/sonic-config.dep +++ b/rules/sonic-config.dep @@ -4,6 +4,7 @@ SPATH := $($(SONIC_CONFIG_ENGINE_PY2)_SRC_PATH) DEP_FILES := $(SONIC_COMMON_FILES_LIST) rules/sonic-config.mk rules/sonic-config.dep DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST) DEP_FILES += $(shell git ls-files $(SPATH)) +DEP_FILES += files/image_config/interfaces/interfaces.j2 dockers/docker-orchagent/ports.json.j2 dockers/docker-dhcp-relay/wait_for_intf.sh.j2 dockers/docker-dhcp-relay/docker-dhcp-relay.supervisord.conf.j2 dockers/docker-lldp/lldpd.conf.j2 dockers/docker-fpm-quagga/bgpd.conf.j2 dockers/docker-fpm-quagga/zebra.conf.j2 dockers/docker-orchagent/ipinip.json.j2 device/arista/x86_64-arista_7050_qx32s/Arista-7050-QX-32S/qos.json.j2 files/build_templates/qos_config.j2 device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/qos.json.j2 dockers/docker-orchagent/switch.json.j2 files/image_config/constants/constants.yml $(SONIC_CONFIG_ENGINE_PY2)_CACHE_MODE := GIT_CONTENT_SHA $(SONIC_CONFIG_ENGINE_PY2)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST)