[build]: Makefile: Extend to build debug docker images for all stretc…

…h dockers (#2789) Overall goal: Build debug images for every stretch docker. An earlier PR (#2789) made the first cut, by transforming broadcom/orchagent to build target/docker-orhagent-dbg.gz. Changes in this PR: Made docker-orchagent build to be platform independent. 1.1) Created rules/docker_orchagent.mk 1.2) Removed platform//docker-orchagent-*.mk 1.3) Removed the corresponding entry from platform//rules.mk Extended the debug docker image build to stretch based syncd dockers. 2.1) For now, only mellanox & barefoot are stretch based. 2.2) All the common variable definitions are put in one place platform/template/docker-syncd-base.mk 2.3) platform/[mellanox, bfn]/docker-syncd-[mlnx, bfn].mk are updated as detailed below. 2.3.1) Set platform code and include template base file 2.3.2) Add the dependencies & debug dependencies and any update over what base template offers. Extended all stretch based non-platform dockers to build debug dockers too. 3.1) Affected are: docker-database.mk, docker-platform-monitor.mk, docker-router-advertiser.mk, docker-teamd.mk, docker-telemetry.mk Next: Build debug flavor of final images with regular dockers replaced with debug dockers where available.
sonic-net · Apr 20, 2019 · ba0ca01 · ba0ca01
1 parent 3198971
commit ba0ca01
Show file tree

Hide file tree

Showing 31 changed files with 165 additions and 272 deletions.
diff --git a/dockers/docker-orchagent-bfn b/dockers/docker-orchagent-bfn
diff --git a/dockers/docker-orchagent-cavm b/dockers/docker-orchagent-cavm
diff --git a/dockers/docker-orchagent-centec b/dockers/docker-orchagent-centec
diff --git a/dockers/docker-orchagent-mlnx b/dockers/docker-orchagent-mlnx
diff --git a/dockers/docker-orchagent-nephos b/dockers/docker-orchagent-nephos
diff --git a/platform/barefoot/docker-orchagent-bfn.mk b/platform/barefoot/docker-orchagent-bfn.mk
diff --git a/platform/barefoot/docker-syncd-bfn.mk b/platform/barefoot/docker-syncd-bfn.mk
@@ -1,23 +1,14 @@
 # docker image for syncd
 
-DOCKER_SYNCD_BFN = docker-syncd-bfn.gz
-$(DOCKER_SYNCD_BFN)_PATH = $(PLATFORM_PATH)/docker-syncd-bfn
-$(DOCKER_SYNCD_BFN)_DEPENDS += $(SYNCD)
-ifeq ($(INSTALL_DEBUG_TOOLS), y)
-$(DOCKER_SYNCD_BFN)_DEPENDS += $(SYNCD_DBG) \
+DOCKER_SYNCD_PLATFORM_CODE = bfn
+include $(PLATFORM_PATH)/../template/docker-syncd-base.mk
+
+$(DOCKER_SYNCD_BASE)_DEPENDS += $(SYNCD)
+
+$(DOCKER_SYNCD_BASE)_DBG_DEPENDS += $(SYNCD_DBG) \
                                $(LIBSWSSCOMMON_DBG) \
                                $(LIBSAIMETADATA_DBG) \
                                $(LIBSAIREDIS_DBG)
-endif
-$(DOCKER_SYNCD_BFN)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_STRETCH)
-SONIC_DOCKER_IMAGES += $(DOCKER_SYNCD_BFN)
-SONIC_STRETCH_DOCKERS += $(DOCKER_SYNCD_BFN)
-ifneq ($(ENABLE_SYNCD_RPC),y)
-SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_SYNCD_BFN)
-endif
 
-$(DOCKER_SYNCD_BFN)_CONTAINER_NAME = syncd
-$(DOCKER_SYNCD_BFN)_RUN_OPT += --net=host --privileged -t
-$(DOCKER_SYNCD_BFN)_RUN_OPT += -v /host/machine.conf:/etc/machine.conf
-$(DOCKER_SYNCD_BFN)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
-$(DOCKER_SYNCD_BFN)_RUN_OPT += -v /host/warmboot:/var/warmboot
+$(DOCKER_SYNCD_BASE)_RUN_OPT += -v /host/warmboot:/var/warmboot
+
diff --git a/platform/barefoot/rules.mk b/platform/barefoot/rules.mk
@@ -6,7 +6,6 @@ include $(PLATFORM_PATH)/platform-modules-ingrasys.mk
 include $(PLATFORM_PATH)/bfn-sai.mk
 include $(PLATFORM_PATH)/docker-syncd-bfn.mk
 include $(PLATFORM_PATH)/docker-syncd-bfn-rpc.mk
-include $(PLATFORM_PATH)/docker-orchagent-bfn.mk
 include $(PLATFORM_PATH)/one-aboot.mk
 include $(PLATFORM_PATH)/one-image.mk
 include $(PLATFORM_PATH)/libsaithrift-dev.mk

diff --git a/platform/broadcom/docker-orchagent-brcm.mk b/platform/broadcom/docker-orchagent-brcm.mk
diff --git a/platform/broadcom/rules.mk b/platform/broadcom/rules.mk
@@ -11,7 +11,6 @@ include $(PLATFORM_PATH)/platform-modules-cel.mk
 include $(PLATFORM_PATH)/platform-modules-delta.mk
 include $(PLATFORM_PATH)/platform-modules-quanta.mk
 #include $(PLATFORM_PATH)/platform-modules-mitac.mk
-include $(PLATFORM_PATH)/docker-orchagent-brcm.mk
 include $(PLATFORM_PATH)/docker-syncd-brcm.mk
 include $(PLATFORM_PATH)/docker-syncd-brcm-rpc.mk
 include $(PLATFORM_PATH)/docker-saiserver-brcm.mk

diff --git a/platform/cavium/docker-orchagent-cavm.mk b/platform/cavium/docker-orchagent-cavm.mk
diff --git a/platform/cavium/rules.mk b/platform/cavium/rules.mk
@@ -1,7 +1,6 @@
 include $(PLATFORM_PATH)/cavm-sai.mk
 include $(PLATFORM_PATH)/docker-syncd-cavm.mk
 include $(PLATFORM_PATH)/docker-syncd-cavm-rpc.mk
-include $(PLATFORM_PATH)/docker-orchagent-cavm.mk
 include $(PLATFORM_PATH)/cavm-platform-modules.mk
 include $(PLATFORM_PATH)/cavm-xpnet.mk
 include $(PLATFORM_PATH)/one-image.mk

diff --git a/platform/centec/docker-orchagent-centec.mk b/platform/centec/docker-orchagent-centec.mk
diff --git a/platform/centec/rules.mk b/platform/centec/rules.mk
@@ -1,6 +1,5 @@
 include $(PLATFORM_PATH)/platform-modules-centec-e582.mk
 include $(PLATFORM_PATH)/sdk.mk
-include $(PLATFORM_PATH)/docker-orchagent-centec.mk
 include $(PLATFORM_PATH)/docker-syncd-centec.mk
 include $(PLATFORM_PATH)/docker-syncd-centec-rpc.mk
 include $(PLATFORM_PATH)/one-image.mk

diff --git a/platform/marvell/docker-orchagent-mrvl.mk b/platform/marvell/docker-orchagent-mrvl.mk
diff --git a/platform/marvell/rules.mk b/platform/marvell/rules.mk
@@ -2,7 +2,6 @@ include $(PLATFORM_PATH)/sdk.mk
 include $(PLATFORM_PATH)/sai.mk
 include $(PLATFORM_PATH)/docker-syncd-mrvl.mk
 include $(PLATFORM_PATH)/docker-syncd-mrvl-rpc.mk
-include $(PLATFORM_PATH)/docker-orchagent-mrvl.mk
 include $(PLATFORM_PATH)/libsaithrift-dev.mk
 include $(PLATFORM_PATH)/one-image.mk
 

diff --git a/platform/mellanox/docker-orchagent-mlnx.mk b/platform/mellanox/docker-orchagent-mlnx.mk
diff --git a/platform/mellanox/docker-syncd-mlnx.mk b/platform/mellanox/docker-syncd-mlnx.mk
@@ -1,25 +1,15 @@
 # docker image for mlnx syncd
 
-DOCKER_SYNCD_MLNX = docker-syncd-mlnx.gz
-$(DOCKER_SYNCD_MLNX)_PATH = $(PLATFORM_PATH)/docker-syncd-mlnx
-$(DOCKER_SYNCD_MLNX)_DEPENDS += $(SYNCD) $(PYTHON_SDK_API)
-ifeq ($(INSTALL_DEBUG_TOOLS), y)
-$(DOCKER_SYNCD_MLNX)_DEPENDS += $(SYNCD_DBG) \
+DOCKER_SYNCD_PLATFORM_CODE = mlnx
+include $(PLATFORM_PATH)/../template/docker-syncd-base.mk
+
+$(DOCKER_SYNCD_BASE)_DEPENDS += $(SYNCD) $(PYTHON_SDK_API)
+$(DOCKER_SYNCD_BASE)_PYTHON_DEBS += $(MLNX_SFPD)
+
+$(DOCKER_SYNCD_BASE)_DBG_DEPENDS += $(SYNCD_DBG) \
                                 $(LIBSWSSCOMMON_DBG) \
                                 $(LIBSAIMETADATA_DBG) \
                                 $(LIBSAIREDIS_DBG)
-endif
-$(DOCKER_SYNCD_MLNX)_PYTHON_DEBS += $(MLNX_SFPD)
-$(DOCKER_SYNCD_MLNX)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_STRETCH)
-SONIC_DOCKER_IMAGES += $(DOCKER_SYNCD_MLNX)
-SONIC_STRETCH_DOCKERS += $(DOCKER_SYNCD_MLNX)
-ifneq ($(ENABLE_SYNCD_RPC),y)
-SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_SYNCD_MLNX)
-endif
 
-$(DOCKER_SYNCD_MLNX)_CONTAINER_NAME = syncd
-$(DOCKER_SYNCD_MLNX)_RUN_OPT += --net=host --privileged -t
-$(DOCKER_SYNCD_MLNX)_RUN_OPT += -v /host/machine.conf:/etc/machine.conf
-$(DOCKER_SYNCD_MLNX)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
-$(DOCKER_SYNCD_MLNX)_RUN_OPT += -v /host/warmboot:/var/warmboot
+$(DOCKER_SYNCD_BASE)_RUN_OPT += -v /host/warmboot:/var/warmboot
 
diff --git a/platform/mellanox/rules.mk b/platform/mellanox/rules.mk
@@ -6,7 +6,6 @@ include $(PLATFORM_PATH)/hw-management.mk
 include $(PLATFORM_PATH)/mlnx-platform-api.mk
 include $(PLATFORM_PATH)/docker-syncd-mlnx.mk
 include $(PLATFORM_PATH)/docker-syncd-mlnx-rpc.mk
-include $(PLATFORM_PATH)/docker-orchagent-mlnx.mk
 include $(PLATFORM_PATH)/docker-saiserver-mlnx.mk
 include $(PLATFORM_PATH)/one-image.mk
 include $(PLATFORM_PATH)/libsaithrift-dev.mk

diff --git a/platform/nephos/docker-orchagent-nephos.mk b/platform/nephos/docker-orchagent-nephos.mk
diff --git a/platform/nephos/rules.mk b/platform/nephos/rules.mk
@@ -3,7 +3,6 @@ include $(PLATFORM_PATH)/sai.mk
 include $(PLATFORM_PATH)/platform-modules-ingrasys.mk
 include $(PLATFORM_PATH)/platform-modules-accton.mk
 include $(PLATFORM_PATH)/platform-modules-cig.mk
-include $(PLATFORM_PATH)/docker-orchagent-nephos.mk
 include $(PLATFORM_PATH)/docker-syncd-nephos.mk
 include $(PLATFORM_PATH)/docker-syncd-nephos-rpc.mk
 include $(PLATFORM_PATH)/one-image.mk

diff --git a/platform/template/docker-syncd-base.mk b/platform/template/docker-syncd-base.mk
@@ -0,0 +1,33 @@
+# docker image for syncd
+
+
+DOCKER_SYNCD_BASE_STEM = docker-syncd-$(DOCKER_SYNCD_PLATFORM_CODE)
+DOCKER_SYNCD_BASE = $(DOCKER_SYNCD_BASE_STEM).gz
+DOCKER_SYNCD_BASE_DBG = $(DOCKER_SYNCD_BASE_STEM)-$(DBG_IMAGE_MARK).gz
+
+$(DOCKER_SYNCD_BASE)_PATH = $(PLATFORM_PATH)/docker-syncd-$(DOCKER_SYNCD_PLATFORM_CODE)
+
+$(DOCKER_SYNCD_BASE)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_STRETCH)
+
+$(DOCKER_SYNCD_BASE)_DBG_DEPENDS += $($(DOCKER_CONFIG_ENGINE_STRETCH)_DBG_DEPENDS)
+
+$(DOCKER_SYNCD_BASE)_DBG_IMAGE_PACKAGES = $($(DOCKER_CONFIG_ENGINE_STRETCH)_DBG_IMAGE_PACKAGES)
+
+SONIC_DOCKER_IMAGES += $(DOCKER_SYNCD_BASE)
+SONIC_STRETCH_DOCKERS += $(DOCKER_SYNCD_BASE)
+ifneq ($(ENABLE_SYNCD_RPC),y)
+SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_SYNCD_BASE)
+endif
+
+SONIC_DOCKER_DBG_IMAGES += $(DOCKER_SYNCD_BASE_DBG)
+SONIC_STRETCH_DBG_DOCKERS += $(DOCKER_SYNCD_BASE_DBG)
+ifneq ($(ENABLE_SYNCD_RPC),y)
+SONIC_INSTALL_DOCKER_DBG_IMAGES += $(DOCKER_SYNCD_BASE_DBG)
+endif
+
+
+$(DOCKER_SYNCD_BASE)_CONTAINER_NAME = syncd
+$(DOCKER_SYNCD_BASE)_RUN_OPT += --net=host --privileged -t
+$(DOCKER_SYNCD_BASE)_RUN_OPT += -v /host/machine.conf:/etc/machine.conf
+$(DOCKER_SYNCD_BASE)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
+
diff --git a/platform/vs/docker-orchagent-vs.mk b/platform/vs/docker-orchagent-vs.mk
diff --git a/platform/vs/rules.mk b/platform/vs/rules.mk
@@ -2,7 +2,6 @@ include $(PLATFORM_PATH)/syncd-vs.mk
 include $(PLATFORM_PATH)/sonic-version.mk
 include $(PLATFORM_PATH)/docker-sonic-vs.mk
 include $(PLATFORM_PATH)/docker-syncd-vs.mk
-include $(PLATFORM_PATH)/docker-orchagent-vs.mk
 include $(PLATFORM_PATH)/one-image.mk
 include $(PLATFORM_PATH)/onie.mk
 include $(PLATFORM_PATH)/kvm-image.mk