Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 5 commits into from
Jan 4, 2021
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5ca11d1
Add changes to allow migration of bfn syncd to buster
dpetryshintl Dec 22, 2020
8e95fed
Update BFN packages for Debian 10
dpetryshintl Dec 29, 2020
7f61257
Merge branch 'master' into sonic_to_buster
dpetryshintl Jan 4, 2021
5ccd9aa
Delete extra empty line
dpetryshintl Jan 4, 2021
2d9cc51
Delete extra empty line
dpetryshintl Jan 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion platform/barefoot/bfn-platform.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)"

SONIC_ONLINE_DEBS += $(BFN_PLATFORM)
Expand Down
2 changes: 1 addition & 1 deletion platform/barefoot/bfn-sai.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)_DEPENDS += $(LIBNL_GENL3_DEV)
Expand Down
1 change: 0 additions & 1 deletion platform/barefoot/docker-ptf-bfn.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,3 @@
DOCKER_PTF_BFN = docker-ptf-bfn.gz
$(DOCKER_PTF_BFN)_PATH = $(DOCKERS_PATH)/docker-ptf-saithrift
$(DOCKER_PTF_BFN)_LOAD_DOCKERS += $(DOCKER_PTF)
SONIC_STRETCH_DOCKERS += $(DOCKER_PTF_BFN)
1 change: 0 additions & 1 deletion platform/barefoot/docker-syncd-bfn-rpc.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ $(DOCKER_SYNCD_BFN_RPC)_DEPENDS += $(SYNCD_RPC_DBG) \
endif
$(DOCKER_SYNCD_BFN_RPC)_LOAD_DOCKERS += $(DOCKER_SYNCD_BASE)
SONIC_DOCKER_IMAGES += $(DOCKER_SYNCD_BFN_RPC)
SONIC_STRETCH_DOCKERS += $(DOCKER_SYNCD_BFN_RPC)
ifeq ($(ENABLE_SYNCD_RPC),y)
SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_SYNCD_BFN_RPC)
endif
Expand Down
3 changes: 0 additions & 3 deletions platform/barefoot/docker-syncd-bfn.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,5 @@ $(DOCKER_SYNCD_BASE)_DBG_DEPENDS += $(SYNCD_DBG) \
$(LIBSAIMETADATA_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)_BASE_IMAGE_FILES += monit_syncd:/etc/monit/conf.d
4 changes: 2 additions & 2 deletions platform/barefoot/docker-syncd-bfn/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM docker-config-engine-stretch
FROM docker-config-engine-buster

## Make apt-get non-interactive
ENV DEBIAN_FRONTEND=noninteractive
Expand All @@ -15,7 +15,7 @@ RUN apt-get install -y \
libxml2 \
libpcap-dev \
libusb-1.0-0-dev \
libcurl3 \
libcurl4 \
libcurl4-gnutls-dev \
libunwind8-dev \
libpython3.4 \
Expand Down
4 changes: 2 additions & 2 deletions platform/barefoot/docker-syncd-bfn/supervisord.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ logfile_backups=2
nodaemon=true

[eventlistener:dependent-startup]
command=python2 -m supervisord_dependent_startup
command=python3 -m supervisord_dependent_startup
autostart=true
autorestart=unexpected
startretries=0
Expand All @@ -13,7 +13,7 @@ events=PROCESS_STATE
buffer_size=25

[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
autostart=true
autorestart=unexpected
Expand Down