Change in docker-playground[master]: osmo-gsm-tester: install mongo-db only for x86_64

osmith gerrit-no-reply at lists.osmocom.org
Wed Apr 14 07:20:03 UTC 2021


osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/23746 )


Change subject: osmo-gsm-tester: install mongo-db only for x86_64
......................................................................

osmo-gsm-tester: install mongo-db only for x86_64

mongo-db is only available for x86_64 from their third party
repository. Don't attempt to install it for another architecture.

This should fix the currently failing "update-osmo-ci-on-slaves"
jenkins job. I've considered disabling the build of the osmo-gsm-tester
container for ARM altogether, but the osmo-gsm-tester manual explicitly
mentions ARM trails.

Change-Id: Ieed36b1adf4b9ae147c7ee7ade22d4855c3dbac8
---
M osmo-gsm-tester/Dockerfile
1 file changed, 4 insertions(+), 2 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/46/23746/1

diff --git a/osmo-gsm-tester/Dockerfile b/osmo-gsm-tester/Dockerfile
index dc8ba1b..7f614dc 100644
--- a/osmo-gsm-tester/Dockerfile
+++ b/osmo-gsm-tester/Dockerfile
@@ -114,9 +114,11 @@
 # install open5gs dependencies: (mongodb not available in Debian)
 # systemctl stuff: workaround for https://jira.mongodb.org/browse/SERVER-54386
 ADD	https://www.mongodb.org/static/pgp/server-4.4.asc /tmp/mongodb-server-4.4.asc
-RUN	apt-key add /tmp/mongodb-server-4.4.asc && \
+RUN	[ "$(arch)" = "x86_64" ] && \
+	apt-key add /tmp/mongodb-server-4.4.asc && \
 	echo "deb http://repo.mongodb.org/apt/debian buster/mongodb-org/4.4 main" > /etc/apt/sources.list.d/mongodb-org-4.4.list
-RUN	apt-get update && \
+RUN	[ "$(arch)" = "x86_64" ] && \
+	apt-get update && \
 	systemctl_path=$(which systemctl) && \
 	mv $systemctl_path /tmp/systemctl && \
 	apt-get install -y --no-install-recommends mongodb-org && \

-- 
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23746
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: Ieed36b1adf4b9ae147c7ee7ade22d4855c3dbac8
Gerrit-Change-Number: 23746
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210414/e7c7ba0c/attachment.htm>


More information about the gerrit-log mailing list