<p>lynxis lazus <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/docker-playground/+/19663">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  laforge: Looks good to me, approved
  lynxis lazus: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">debian-stretch-jenkins: install osmo-python-tests for python2<br><br>osmo-python-tests for python2 is being used when building<br>old releases.<br><br>Change-Id: I63b3e92e745a664d5d0168c718daddae83c20df5<br>---<br>M debian-stretch-jenkins/Dockerfile<br>1 file changed, 17 insertions(+), 3 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 158f7d7..e73b7ae 100644</span><br><span>--- a/debian-stretch-jenkins/Dockerfile</span><br><span>+++ b/debian-stretch-jenkins/Dockerfile</span><br><span>@@ -100,6 +100,10 @@</span><br><span>               python3-setuptools \</span><br><span>                 python3-usb \</span><br><span>                python3-yaml \</span><br><span style="color: hsl(120, 100%, 40%);">+                python2.7 \</span><br><span style="color: hsl(120, 100%, 40%);">+           python-pip \</span><br><span style="color: hsl(120, 100%, 40%);">+          python-setuptools \</span><br><span style="color: hsl(120, 100%, 40%);">+           python-yaml \</span><br><span>                rsync \</span><br><span>              sdcc \</span><br><span>               sqlite3 \</span><br><span>@@ -127,9 +131,19 @@</span><br><span> RUN mkdir /build</span><br><span> RUN chown build:build /build</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-# Install osmo-python-tests</span><br><span style="color: hsl(0, 100%, 40%);">-ADD http://git.osmocom.org/python/osmo-python-tests/patch /tmp/commit</span><br><span style="color: hsl(0, 100%, 40%);">-RUN git clone git://git.osmocom.org/python/osmo-python-tests && cd osmo-python-tests && ./contrib/jenkins.sh</span><br><span style="color: hsl(120, 100%, 40%);">+# Install osmo-python-tests for python2 (when building old tags again new releases)</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMO_PYTHON2_TESTS_COMMIT=fb4b813d4df62b7b2445bdced961eb1847267eed</span><br><span style="color: hsl(120, 100%, 40%);">+ADD http://git.osmocom.org/python/osmo-python-tests/patch/?id=$OSMO_PYTHON2_TESTS_COMMIT /tmp/osmo-python-tests2-commit</span><br><span style="color: hsl(120, 100%, 40%);">+RUN git clone https://git.osmocom.org/python/osmo-python-tests osmo-python-tests2 && \</span><br><span style="color: hsl(120, 100%, 40%);">+    cd osmo-python-tests2 && \</span><br><span style="color: hsl(120, 100%, 40%);">+    git checkout $OSMO_PYTHON2_TESTS_COMMIT && \</span><br><span style="color: hsl(120, 100%, 40%);">+  python2 setup.py clean build install</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+# Install osmo-python-tests for python3</span><br><span style="color: hsl(120, 100%, 40%);">+ADD http://git.osmocom.org/python/osmo-python-tests/patch /tmp/osmo-python-tests3-commit</span><br><span style="color: hsl(120, 100%, 40%);">+RUN git clone https://git.osmocom.org/python/osmo-python-tests osmo-python-tests3 && \</span><br><span style="color: hsl(120, 100%, 40%);">+     cd osmo-python-tests3 && \</span><br><span style="color: hsl(120, 100%, 40%);">+    python3 setup.py clean build install</span><br><span> </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></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/docker-playground/+/19663">change 19663</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/+/19663"/><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: I63b3e92e745a664d5d0168c718daddae83c20df5 </div>
<div style="display:none"> Gerrit-Change-Number: 19663 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>