<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/docker-playground/+/17276">View Change</a></p><div style="white-space:pre-wrap">Approvals:
pespin: Verified
osmith: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">debian-stretch-jenkins: Install libulfius from osmocom OBS repos<br><br>We currently build libulfius 2.5. It doesn't say anywhere in osmo-remsim<br>that libulfius-3.6.4 is required anyway.<br><br>Change-Id: Ie6b07f676f8e06959eaac5e865c163de3f9c939d<br>---<br>M debian-stretch-jenkins/Dockerfile<br>A debian-stretch-jenkins/Release.key<br>2 files changed, 31 insertions(+), 11 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/debian-stretch-jenkins/Dockerfile b/debian-stretch-jenkins/Dockerfile</span><br><span>index 92d5bdd..ddf8f87 100644</span><br><span>--- a/debian-stretch-jenkins/Dockerfile</span><br><span>+++ b/debian-stretch-jenkins/Dockerfile</span><br><span>@@ -133,17 +133,17 @@</span><br><span> update-locale LANG=en_US.UTF-8</span><br><span> ENV LANG en_US.UTF-8</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-# osmo-remsim needs libulfius (which indirectly depends on systemd, installed above)</span><br><span style="color: hsl(0, 100%, 40%);">-ARG LIBULFIUS_VER="2.6.4"</span><br><span style="color: hsl(0, 100%, 40%);">-ARG LIBULFIUS_PATH="https://github.com/babelouest/ulfius/releases/download/v${LIBULFIUS_VER}"</span><br><span style="color: hsl(0, 100%, 40%);">-ADD ${LIBULFIUS_PATH}/libulfius-dev_${LIBULFIUS_VER}_debian_${DEBIAN_VERSION}_x86_64.deb /tmp/ulfius/libulfius-dev.deb</span><br><span style="color: hsl(0, 100%, 40%);">-ADD ${LIBULFIUS_PATH}/ulfius-dev-full_${LIBULFIUS_VER}_debian_${DEBIAN_VERSION}_x86_64.tar.gz /tmp/ulfius/all.tar.gz</span><br><span style="color: hsl(0, 100%, 40%);">-RUN cd /tmp/ulfius && \</span><br><span style="color: hsl(0, 100%, 40%);">- tar -xvf all.tar.gz && \</span><br><span style="color: hsl(0, 100%, 40%);">- DEBIAN_FRONTEND=noninteractive apt-get update && \</span><br><span style="color: hsl(0, 100%, 40%);">- DEBIAN_FRONTEND=noninteractive apt-get install -y /tmp/ulfius/*.deb && \</span><br><span style="color: hsl(0, 100%, 40%);">- cd ~ && \</span><br><span style="color: hsl(0, 100%, 40%);">- rm -r /tmp/ulfius</span><br><span style="color: hsl(120, 100%, 40%);">+# osmo-remsim needs libulfius which is built in osmocom OBS repos:</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_9.0/"</span><br><span style="color: hsl(120, 100%, 40%);">+COPY Release.key /tmp/Release.key</span><br><span style="color: hsl(120, 100%, 40%);">+RUN apt-key add /tmp/Release.key && \</span><br><span style="color: hsl(120, 100%, 40%);">+ rm /tmp/Release.key && \</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-nightly.list</span><br><span style="color: hsl(120, 100%, 40%);">+ADD $OSMOCOM_REPO/Release /tmp/Release</span><br><span style="color: hsl(120, 100%, 40%);">+RUN 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%);">+ libulfius-dev && \</span><br><span style="color: hsl(120, 100%, 40%);">+ apt-get clean</span><br><span> </span><br><span> # osmo-python-tests' contrib/jenkins.sh writes to /usr/local as user</span><br><span> RUN chown -R build:build /usr/local</span><br><span>diff --git a/debian-stretch-jenkins/Release.key b/debian-stretch-jenkins/Release.key</span><br><span>new file mode 100644</span><br><span>index 0000000..e656238</span><br><span>--- /dev/null</span><br><span>+++ b/debian-stretch-jenkins/Release.key</span><br><span>@@ -0,0 +1,20 @@</span><br><span style="color: hsl(120, 100%, 40%);">+-----BEGIN PGP PUBLIC KEY BLOCK-----</span><br><span style="color: hsl(120, 100%, 40%);">+Version: GnuPG v1.4.5 (GNU/Linux)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+mQENBFJBt/wBCADAht3d/ilNuyzaXYw/QwTRvmjyoDvfXw+H/3Fvk1zlDZoiKPPc</span><br><span style="color: hsl(120, 100%, 40%);">+a1wCVBINUZl7vYM2OXqbJwYa++JP2Q48xKSvC6thbRc/YLievkbcvTemf7IaREfl</span><br><span style="color: hsl(120, 100%, 40%);">+CTjoYpoqXHa9kHMw1aALDm8CNU88jZmnV7v9L6hKkbYDxie+jpoj7D6B9JlxgNJ4</span><br><span style="color: hsl(120, 100%, 40%);">+5dQyRNsFGVcIl4Vplt1HyGc5Q5nQI/VgS2rlF/IOXmhRQBc4LEDdU8R2IKnkU4ee</span><br><span style="color: hsl(120, 100%, 40%);">+S7TWanAigGAQhxGuCkS39/CWzc1DhLhjlNhBl/+RTPejkqJtAy00ZLps3+RqUN1Y</span><br><span style="color: hsl(120, 100%, 40%);">+CU/Fsr7aRlYVGqQ/BlptwV0XQ2VVYJX2oEBBABEBAAG0MG5ldHdvcmsgT0JTIFBy</span><br><span style="color: hsl(120, 100%, 40%);">+b2plY3QgPG5ldHdvcmtAYnVpbGQub3BlbnN1c2Uub3JnPokBPAQTAQIAJgUCWmMc</span><br><span style="color: hsl(120, 100%, 40%);">+aQIbAwUJDEAUbQYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEGLrGgkXKA3fjsoI</span><br><span style="color: hsl(120, 100%, 40%);">+ALSXmXzFCpTxg8a6tvXkqddY/qAmeBMNUf7hslI9wN3leNmCrnuHS8TbHWYJZgtw</span><br><span style="color: hsl(120, 100%, 40%);">+8M5fKL3aRQYaIiqqm1XOUF0OqwYNDj5V3y38mM68NYOkzgSP7foMwZp9Y0TlGhtI</span><br><span style="color: hsl(120, 100%, 40%);">+L8weA+2RUjB4hwwGMAYMqkRZyKW3NhPqdlGGoXac1ilwEyGXFHdOLbkhtyS+P2yb</span><br><span style="color: hsl(120, 100%, 40%);">+/EvaKIN5cMLzRZKeYgdp9WuAirV+yV/SDbgvabW098lrWhGLltlRRDQgMV883p8I</span><br><span style="color: hsl(120, 100%, 40%);">+ERMI1wlLFZGnHL3mfBWGeQ24M/DaBOdXQDtfBLCJ9nGztmDBUb8i6GFWU7nD2TGi</span><br><span style="color: hsl(120, 100%, 40%);">+8mYUsED1ZDwO/0jdvJ4gSluIRgQTEQIABgUCUkG3/AAKCRA7MBG3a51lIzhdAJ9v</span><br><span style="color: hsl(120, 100%, 40%);">+d6XPffMZRcCGgDEY5OaTn/MsCQCgrXbeZpFJgnirSrc8rRonvzYFiF4=</span><br><span style="color: hsl(120, 100%, 40%);">+=Gvly</span><br><span style="color: hsl(120, 100%, 40%);">+-----END PGP PUBLIC KEY BLOCK-----</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/docker-playground/+/17276">change 17276</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/+/17276"/><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: Ie6b07f676f8e06959eaac5e865c163de3f9c939d </div>
<div style="display:none"> Gerrit-Change-Number: 17276 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </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>