Merge branch 'pde_infra' of https://github.com/geans-pin/sonic-buildi…

…mage into pde_infra
sonic-net · May 27, 2021 · 1945c12 · 1945c12
2 parents de606bb + c152419
commit 1945c12
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 0 deletions.
diff --git a/dockers/docker-pde/Dockerfile.j2 b/dockers/docker-pde/Dockerfile.j2
@@ -20,9 +20,15 @@ RUN apt-get update && apt-get install -y ipmitool telnet busybox kmod libpcap-de
 RUN apt-get install -y bzip2 curl ioping openssl bc sysstat
 
 # Packages for PDDF
+<<<<<<< HEAD
 RUN apt-get install -y python-jsonschema
 
 RUN pip3 install pytest pexpect
+=======
+RUN apt-get install -y python-jsonschema i2c-tools
+
+RUN pip install pytest pexpect
+>>>>>>> c1524191c8a0aa0770288e4b5f846c87729c3bd3
 
 {% if docker_pde_debs.strip() -%}
 # Copy locally-built Debian package dependencies
@@ -61,7 +67,11 @@ python-wheels/{{ whl }}{{' '}}
 /python-wheels/
 
 # Install locally-built Python wheel dependencies
+<<<<<<< HEAD
 RUN pip3  install \
+=======
+RUN pip install \
+>>>>>>> c1524191c8a0aa0770288e4b5f846c87729c3bd3
 {% for whl in docker_pde_whls.split(' ') -%}
 /python-wheels/{{ whl }}{{' '}}
 {%- endfor %}

diff --git a/platform/broadcom/docker-pde.mk b/platform/broadcom/docker-pde.mk
@@ -11,6 +11,7 @@ $(DOCKER_PDE)_PATH = $(DOCKERS_PATH)/$(DOCKER_PDE_STEM)
 
 $(DOCKER_PDE)_DEPENDS += $(PYTHON_NETIFACES)
 $(DOCKER_PDE)_DEPENDS += $(SONIC_PLATFORM_PDE) $(BRCM_SAI)
+<<<<<<< HEAD
 $(DOCKER_PDE_RDEPENDS += $(PYTHON_NETIFACES)
 
 $(DOCKER_PDE)_PYTHON_DEBS += $(SONIC_UTILS)
@@ -29,6 +30,27 @@ SONIC_DOCKER_IMAGES += $(DOCKER_PDE)
 SONIC_BUSTER_DOCKERS += $(DOCKER_PDE)
 SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_PDE)
 SONIC_BUSTER_DBG_DOCKERS += $(DOCKER_PDE_DBG)
+=======
+
+$(DOCKER_PDE_RDEPENDS += $(PYTHON_NETIFACES)
+
+$(DOCKER_PDE)_PYTHON_DEBS += $(SONIC_UTILS)
+$(DOCKER_PDE)_PYTHON_WHEELS += $(SONIC_PLATFORM_COMMON_PY2)
+ifeq ($(PDDF_SUPPORT), y)
+$(DOCKER_PDE)_PYTHON_WHEELS += $(PDDF_PLATFORM_API_BASE_PY2)
+endif
+$(DOCKER_PDE)_PYTHON_WHEELS += $(SONIC_DAEMON_BASE_PY2)
+$(DOCKER_PDE)_DBG_DEPENDS = $($(DOCKER_CONFIG_ENGINE_STRETCH)_DBG_DEPENDS)
+$(DOCKER_PDE)_DBG_IMAGE_PACKAGES = $($(DOCKER_CONFIG_ENGINE_STRETCH)_DBG_IMAGE_PACKAGES)
+
+$(DOCKER_PDE)_LOAD_DOCKERS = $(DOCKER_CONFIG_ENGINE_STRETCH)
+
+SONIC_DOCKER_IMAGES += $(DOCKER_PDE)
+SONIC_STRETCH_DOCKERS += $(DOCKER_PDE)
+SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_PDE)
+
+SONIC_STRETCH_DBG_DOCKERS += $(DOCKER_PDE_DBG)
+>>>>>>> c1524191c8a0aa0770288e4b5f846c87729c3bd3
 SONIC_DOCKER_DBG_IMAGES += $(DOCKER_PDE_DBG)
 SONIC_INSTALL_DOCKER_DBG_IMAGES += $(DOCKER_PDE_DBG)
 
@@ -37,13 +59,23 @@ $(DOCKER_PDE)_RUN_OPT += --net=host --privileged -t
 $(DOCKER_PDE)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
 $(DOCKER_PDE)_RUN_OPT += -v /host/machine.conf:/host/machine.conf:ro
 $(DOCKER_PDE)_RUN_OPT += -v /usr/lib/python2.7/dist-packages:/usr/share/sonic/classes:ro
+<<<<<<< HEAD
 $(DOCKER_PDE)_RUN_OPT += -v /usr/local/lib/python3.7/dist-packages/utilities_common:/usr/local/lib/python3.7/dist-packages/utilities_common:ro
 $(DOCKER_PDE)_RUN_OPT += -v /var/log/syslog:/var/log/syslog:ro
 $(DOCKER_PDE)_RUN_OPT += -v /lib/modules:/lib/modules:ro
 $(DOCKER_PDE)_RUN_OPT += -v /boot:/boot:ro
 $(DOCKER_PDE)_RUN_OPT += -v /var/log/ramfs:/var/log/ramfs:ro
 $(DOCKER_PDE)_RUN_OPT += -v /usr/share/sonic/device/x86_64-broadcom_common:/usr/share/sonic/device/x86_64-broadcom_common:ro
 $(DOCKER_PDE)_RUN_OPT += -v /usr/share/sonic/device/pddf:/usr/share/sonic/device/pddf:ro
+=======
+$(DOCKER_PDE)_RUN_OPT += -v /var/log/syslog:/var/log/syslog:ro
+$(DOCKER_PDE)_RUN_OPT += -v /var/log/ramfs:/var/log/ramfs:ro
+$(DOCKER_PDE)_RUN_OPT += -v /lib/modules:/lib/modules:ro
+$(DOCKER_PDE)_RUN_OPT += -v /boot:/boot:ro
+
+$(DOCKER_PDE)_RUN_OPT += -v /usr/share/sonic/device/pddf:/usr/share/sonic/device/pddf:ro
+$(DOCKER_PDE)_RUN_OPT += -v /usr/share/sonic/device/x86_64-broadcom_common:/usr/share/sonic/device/x86_64-broadcom_common:ro
+>>>>>>> c1524191c8a0aa0770288e4b5f846c87729c3bd3
 $(DOCKER_PDE)_BASE_IMAGE_FILES += pde-test:/usr/local/bin/pde-test
 $(DOCKER_PDE)_BASE_IMAGE_FILES += pde-bench:/usr/local/bin/pde-bench
 $(DOCKER_PDE)_BASE_IMAGE_FILES += pde-stress:/usr/local/bin/pde-stress