<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/docker-playground/+/22094">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  laforge: Looks good to me, approved; Verified
  pespin: Looks good to me, but someone else must approve

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">debian-stretch-jenkins, osmo-gsm-tester: add osmo-ci<br><br>Clone osmo-ci.git, and install all files from scripts/* to<br>/usr/local/bin. Together with osmo-ci<br>I45bd7ea56849dab839a98cfd52806f7cd288094e, this will make overwriting<br>PATH obsolete.<br><br>Related: OS#4911<br>Change-Id: I0820f13cd740f7d4a8999d279cef6ae293a67d81<br>---<br>M debian-stretch-jenkins/Dockerfile<br>M osmo-gsm-tester/Dockerfile<br>2 files changed, 16 insertions(+), 0 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 6455a21..1f87445 100644</span><br><span>--- a/debian-stretch-jenkins/Dockerfile</span><br><span>+++ b/debian-stretch-jenkins/Dockerfile</span><br><span>@@ -148,6 +148,14 @@</span><br><span>       cd osmo-python-tests3 && \</span><br><span>   python3 setup.py clean build install</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+# Install osmo-ci.git/scripts to /usr/local/bin</span><br><span style="color: hsl(120, 100%, 40%);">+ADD http://git.osmocom.org/osmo-ci/patch /tmp/osmo-ci-commit</span><br><span style="color: hsl(120, 100%, 40%);">+RUN git clone https://git.osmocom.org/osmo-ci osmo-ci && \</span><br><span style="color: hsl(120, 100%, 40%);">+   cp -v $(find osmo-ci/scripts \</span><br><span style="color: hsl(120, 100%, 40%);">+                -maxdepth 1 \</span><br><span style="color: hsl(120, 100%, 40%);">+         -type f ) \</span><br><span style="color: hsl(120, 100%, 40%);">+   /usr/local/bin</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> # Set a UTF-8 locale</span><br><span> RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \</span><br><span>     dpkg-reconfigure --frontend=noninteractive locales && \</span><br><span>diff --git a/osmo-gsm-tester/Dockerfile b/osmo-gsm-tester/Dockerfile</span><br><span>index 675d7df..0503fc6 100644</span><br><span>--- a/osmo-gsm-tester/Dockerfile</span><br><span>+++ b/osmo-gsm-tester/Dockerfile</span><br><span>@@ -135,6 +135,14 @@</span><br><span>         (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_GSM_TESTER_BRANCH || exit 1); \</span><br><span>   git rev-parse --abbrev-ref HEAD && git rev-parse HEAD</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+# Install osmo-ci.git/scripts to /usr/local/bin</span><br><span style="color: hsl(120, 100%, 40%);">+ADD http://git.osmocom.org/osmo-ci/patch /tmp/osmo-ci-commit</span><br><span style="color: hsl(120, 100%, 40%);">+RUN git clone https://git.osmocom.org/osmo-ci osmo-ci && \</span><br><span style="color: hsl(120, 100%, 40%);">+  cp -v $(find osmo-ci/scripts \</span><br><span style="color: hsl(120, 100%, 40%);">+                -maxdepth 1 \</span><br><span style="color: hsl(120, 100%, 40%);">+         -type f ) \</span><br><span style="color: hsl(120, 100%, 40%);">+   /usr/local/bin</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> # Copy several scripts and permission for osmo-gsm-tester:</span><br><span> RUN     mkdir -p /usr/local/bin/ && cp osmo-gsm-tester/utils/bin/* /usr/local/bin/</span><br><span> RUN     mkdir -p /etc/sudoers.d/ && cp osmo-gsm-tester/utils/sudoers.d/* /etc/sudoers.d/</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/docker-playground/+/22094">change 22094</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/+/22094"/><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: I0820f13cd740f7d4a8999d279cef6ae293a67d81 </div>
<div style="display:none"> Gerrit-Change-Number: 22094 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>