matthew/sonic-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[BFN] Upgrade docker-syncd-bfn to buster (#6345)

Browse Source 
* Add changes to allow migration of bfn syncd to buster

* Update BFN packages for Debian 10

Signed-off-by: Denys Petryshyn <denysx.petryshyn@intel.com>
This commit is contained in:
Denys Petryshyn 2021-01-04 20:38:53 +02:00 committed by Guohan Lu
parent 711b7f8079
commit 42fa096883
7 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
platform/barefoot/bfn-platform.mk
View File

@ -1,4 +1,4 @@
BFN_PLATFORM = bfnplatform_20201224_deb9.deb BFN_PLATFORM = bfnplatform_20201228_deb10.deb
$(BFN_PLATFORM)_URL = "https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/$(BFN_PLATFORM)" $(BFN_PLATFORM)_URL = "https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/$(BFN_PLATFORM)"
SONIC_ONLINE_DEBS += $(BFN_PLATFORM) SONIC_ONLINE_DEBS += $(BFN_PLATFORM)

2
platform/barefoot/bfn-sai.mk
View File

@ -1,4 +1,4 @@
BFN_SAI = bfnsdk_20201224_deb9.deb BFN_SAI = bfnsdk_20201228_deb10.deb
$(BFN_SAI)_URL = "https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/$(BFN_SAI)" $(BFN_SAI)_URL = "https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/$(BFN_SAI)"
$(BFN_SAI)_DEPENDS += $(LIBNL_GENL3_DEV) $(BFN_SAI)_DEPENDS += $(LIBNL_GENL3_DEV)

1
platform/barefoot/docker-ptf-bfn.mk
View File

@ -3,4 +3,3 @@
DOCKER_PTF_BFN = docker-ptf-bfn.gz DOCKER_PTF_BFN = docker-ptf-bfn.gz
$(DOCKER_PTF_BFN)_PATH = $(DOCKERS_PATH)/docker-ptf-saithrift $(DOCKER_PTF_BFN)_PATH = $(DOCKERS_PATH)/docker-ptf-saithrift
$(DOCKER_PTF_BFN)_LOAD_DOCKERS += $(DOCKER_PTF) $(DOCKER_PTF_BFN)_LOAD_DOCKERS += $(DOCKER_PTF)
SONIC_STRETCH_DOCKERS += $(DOCKER_PTF_BFN)

1
platform/barefoot/docker-syncd-bfn-rpc.mk
View File

@ -12,7 +12,6 @@ $(DOCKER_SYNCD_BFN_RPC)_DEPENDS += $(SYNCD_RPC_DBG) \
endif endif
$(DOCKER_SYNCD_BFN_RPC)_LOAD_DOCKERS += $(DOCKER_SYNCD_BASE) $(DOCKER_SYNCD_BFN_RPC)_LOAD_DOCKERS += $(DOCKER_SYNCD_BASE)
SONIC_DOCKER_IMAGES += $(DOCKER_SYNCD_BFN_RPC) SONIC_DOCKER_IMAGES += $(DOCKER_SYNCD_BFN_RPC)
SONIC_STRETCH_DOCKERS += $(DOCKER_SYNCD_BFN_RPC)
ifeq ($(ENABLE_SYNCD_RPC),y) ifeq ($(ENABLE_SYNCD_RPC),y)
SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_SYNCD_BFN_RPC) SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_SYNCD_BFN_RPC)
endif endif

3
platform/barefoot/docker-syncd-bfn.mk
View File

@ -10,8 +10,5 @@ $(DOCKER_SYNCD_BASE)_DBG_DEPENDS += $(SYNCD_DBG) \
$(LIBSAIMETADATA_DBG) \ $(LIBSAIMETADATA_DBG) \
$(LIBSAIREDIS_DBG) $(LIBSAIREDIS_DBG)
SONIC_STRETCH_DOCKERS += $(DOCKER_SYNCD_BASE)
SONIC_STRETCH_DBG_DOCKERS += $(DOCKER_SYNCD_BASE_DBG)
$(DOCKER_SYNCD_BASE)_RUN_OPT += -v /host/warmboot:/var/warmboot $(DOCKER_SYNCD_BASE)_RUN_OPT += -v /host/warmboot:/var/warmboot
$(DOCKER_SYNCD_BASE)_BASE_IMAGE_FILES += monit_syncd:/etc/monit/conf.d $(DOCKER_SYNCD_BASE)_BASE_IMAGE_FILES += monit_syncd:/etc/monit/conf.d

4
platform/barefoot/docker-syncd-bfn/Dockerfile.j2
View File

@ -1,4 +1,4 @@
FROM docker-config-engine-stretch FROM docker-config-engine-buster
## Make apt-get non-interactive ## Make apt-get non-interactive
ENV DEBIAN_FRONTEND=noninteractive ENV DEBIAN_FRONTEND=noninteractive
@ -15,7 +15,7 @@ RUN apt-get install -y \
libxml2 \ libxml2 \
libpcap-dev \ libpcap-dev \
libusb-1.0-0-dev \ libusb-1.0-0-dev \
libcurl3 \ libcurl4 \
libcurl4-gnutls-dev \ libcurl4-gnutls-dev \
libunwind8-dev \ libunwind8-dev \
libpython3.4 \ libpython3.4 \

4
platform/barefoot/docker-syncd-bfn/supervisord.conf
View File

@ -4,7 +4,7 @@ logfile_backups=2
nodaemon=true nodaemon=true
[eventlistener:dependent-startup] [eventlistener:dependent-startup]
command=python2 -m supervisord_dependent_startup command=python3 -m supervisord_dependent_startup
autostart=true autostart=true
autorestart=unexpected autorestart=unexpected
startretries=0 startretries=0
@ -13,7 +13,7 @@ events=PROCESS_STATE
buffer_size=25 buffer_size=25
[eventlistener:supervisor-proc-exit-listener] [eventlistener:supervisor-proc-exit-listener]
command=python2 /usr/bin/supervisor-proc-exit-listener --container-name syncd command=/usr/bin/supervisor-proc-exit-listener --container-name syncd
events=PROCESS_STATE_EXITED events=PROCESS_STATE_EXITED
autostart=true autostart=true
autorestart=unexpected autorestart=unexpected