<p>osmith <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/docker-playground/+/23746">View Change</a></p><div style="white-space:pre-wrap">Approvals:
osmith: Verified
pespin: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">osmo-gsm-tester: open5gs deps only for x86_64<br><br>mongo-db is only available for x86_64 from their third party<br>repository. Don't attempt to install it for another architecture. As<br>this is part of the open5gs dependencies, don't install any of them<br>either.<br><br>This should fix the currently failing "update-osmo-ci-on-slaves"<br>jenkins job. I've considered disabling the build of the osmo-gsm-tester<br>container for ARM altogether, but the osmo-gsm-tester manual explicitly<br>mentions ARM trails.<br><br>Change-Id: Ieed36b1adf4b9ae147c7ee7ade22d4855c3dbac8<br>---<br>M osmo-gsm-tester/Dockerfile<br>1 file changed, 40 insertions(+), 33 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/osmo-gsm-tester/Dockerfile b/osmo-gsm-tester/Dockerfile</span><br><span>index dc8ba1b..a69b5b2 100644</span><br><span>--- a/osmo-gsm-tester/Dockerfile</span><br><span>+++ b/osmo-gsm-tester/Dockerfile</span><br><span>@@ -114,41 +114,48 @@</span><br><span> # install open5gs dependencies: (mongodb not available in Debian)</span><br><span> # systemctl stuff: workaround for https://jira.mongodb.org/browse/SERVER-54386</span><br><span> ADD https://www.mongodb.org/static/pgp/server-4.4.asc /tmp/mongodb-server-4.4.asc</span><br><span style="color: hsl(0, 100%, 40%);">-RUN apt-key add /tmp/mongodb-server-4.4.asc && \</span><br><span style="color: hsl(0, 100%, 40%);">- echo "deb http://repo.mongodb.org/apt/debian buster/mongodb-org/4.4 main" > /etc/apt/sources.list.d/mongodb-org-4.4.list</span><br><span style="color: hsl(0, 100%, 40%);">-RUN apt-get update && \</span><br><span style="color: hsl(0, 100%, 40%);">- systemctl_path=$(which systemctl) && \</span><br><span style="color: hsl(0, 100%, 40%);">- mv $systemctl_path /tmp/systemctl && \</span><br><span style="color: hsl(0, 100%, 40%);">- apt-get install -y --no-install-recommends mongodb-org && \</span><br><span style="color: hsl(0, 100%, 40%);">- apt-get clean && \</span><br><span style="color: hsl(0, 100%, 40%);">- mv /tmp/systemctl $systemctl_path && \</span><br><span style="color: hsl(0, 100%, 40%);">- sed -i "s/127.0.0.1/$OGT_MASTER_ADDR/g" /etc/mongod.conf</span><br><span style="color: hsl(120, 100%, 40%);">+RUN if [ "$(arch)" = "x86_64" ]; then \</span><br><span style="color: hsl(120, 100%, 40%);">+ apt-key add /tmp/mongodb-server-4.4.asc && \</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "deb http://repo.mongodb.org/apt/debian buster/mongodb-org/4.4 main" \</span><br><span style="color: hsl(120, 100%, 40%);">+ > /etc/apt/sources.list.d/mongodb-org-4.4.list; \</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span style="color: hsl(120, 100%, 40%);">+RUN if [ "$(arch)" = "x86_64" ]; then \</span><br><span style="color: hsl(120, 100%, 40%);">+ apt-get update && \</span><br><span style="color: hsl(120, 100%, 40%);">+ systemctl_path=$(which systemctl) && \</span><br><span style="color: hsl(120, 100%, 40%);">+ mv $systemctl_path /tmp/systemctl && \</span><br><span style="color: hsl(120, 100%, 40%);">+ apt-get install -y --no-install-recommends mongodb-org && \</span><br><span style="color: hsl(120, 100%, 40%);">+ apt-get clean && \</span><br><span style="color: hsl(120, 100%, 40%);">+ mv /tmp/systemctl $systemctl_path && \</span><br><span style="color: hsl(120, 100%, 40%);">+ sed -i "s/127.0.0.1/$OGT_MASTER_ADDR/g" /etc/mongod.conf; \</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span> </span><br><span> # install open5gs dependencies:</span><br><span style="color: hsl(0, 100%, 40%);">-RUN apt-get update && \</span><br><span style="color: hsl(0, 100%, 40%);">- apt-get install -y --no-install-recommends \</span><br><span style="color: hsl(0, 100%, 40%);">- python3-pip \</span><br><span style="color: hsl(0, 100%, 40%);">- python3-setuptools \</span><br><span style="color: hsl(0, 100%, 40%);">- python3-wheel \</span><br><span style="color: hsl(0, 100%, 40%);">- ninja-build \</span><br><span style="color: hsl(0, 100%, 40%);">- build-essential \</span><br><span style="color: hsl(0, 100%, 40%);">- flex \</span><br><span style="color: hsl(0, 100%, 40%);">- bison \</span><br><span style="color: hsl(0, 100%, 40%);">- git \</span><br><span style="color: hsl(0, 100%, 40%);">- libsctp-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libgnutls28-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libgcrypt-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libssl-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libidn11-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libmongoc-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libbson-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libyaml-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libnghttp2-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libmicrohttpd-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libcurl4-gnutls-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libnghttp2-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- meson && \</span><br><span style="color: hsl(0, 100%, 40%);">- apt-get clean</span><br><span style="color: hsl(120, 100%, 40%);">+RUN if [ "$(arch)" = "x86_64" ]; then \</span><br><span style="color: hsl(120, 100%, 40%);">+ apt-get update && \</span><br><span style="color: hsl(120, 100%, 40%);">+ apt-get install -y --no-install-recommends \</span><br><span style="color: hsl(120, 100%, 40%);">+ python3-pip \</span><br><span style="color: hsl(120, 100%, 40%);">+ python3-setuptools \</span><br><span style="color: hsl(120, 100%, 40%);">+ python3-wheel \</span><br><span style="color: hsl(120, 100%, 40%);">+ ninja-build \</span><br><span style="color: hsl(120, 100%, 40%);">+ build-essential \</span><br><span style="color: hsl(120, 100%, 40%);">+ flex \</span><br><span style="color: hsl(120, 100%, 40%);">+ bison \</span><br><span style="color: hsl(120, 100%, 40%);">+ git \</span><br><span style="color: hsl(120, 100%, 40%);">+ libsctp-dev \</span><br><span style="color: hsl(120, 100%, 40%);">+ libgnutls28-dev \</span><br><span style="color: hsl(120, 100%, 40%);">+ libgcrypt-dev \</span><br><span style="color: hsl(120, 100%, 40%);">+ libssl-dev \</span><br><span style="color: hsl(120, 100%, 40%);">+ libidn11-dev \</span><br><span style="color: hsl(120, 100%, 40%);">+ libmongoc-dev \</span><br><span style="color: hsl(120, 100%, 40%);">+ libbson-dev \</span><br><span style="color: hsl(120, 100%, 40%);">+ libyaml-dev \</span><br><span style="color: hsl(120, 100%, 40%);">+ libnghttp2-dev \</span><br><span style="color: hsl(120, 100%, 40%);">+ libmicrohttpd-dev \</span><br><span style="color: hsl(120, 100%, 40%);">+ libcurl4-gnutls-dev \</span><br><span style="color: hsl(120, 100%, 40%);">+ libnghttp2-dev \</span><br><span style="color: hsl(120, 100%, 40%);">+ meson && \</span><br><span style="color: hsl(120, 100%, 40%);">+ apt-get clean; \</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span> </span><br><span> WORKDIR /tmp</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/docker-playground/+/23746">change 23746</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/docker-playground/+/23746"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: docker-playground </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ieed36b1adf4b9ae147c7ee7ade22d4855c3dbac8 </div>
<div style="display:none"> Gerrit-Change-Number: 23746 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>