<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/docker-playground/+/26585">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">nplab: Switch from stretch to buster<br><br>The test suites require guile-2.0 so we have to stay with buster<br>and cannot upgrade to bullseye (guile-3.0 only).<br><br>Change-Id: I30c05efbc6c7a21cad71b207e723ef958f1ac9be<br>---<br>M nplab-m3ua-test/Dockerfile<br>M nplab-m3ua-test/jenkins.sh<br>M nplab-sua-test/jenkins.sh<br>M sigtran-tests/Dockerfile<br>4 files changed, 8 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/85/26585/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/nplab-m3ua-test/Dockerfile b/nplab-m3ua-test/Dockerfile</span><br><span>index ba5d17d..a7891e1 100644</span><br><span>--- a/nplab-m3ua-test/Dockerfile</span><br><span>+++ b/nplab-m3ua-test/Dockerfile</span><br><span>@@ -6,7 +6,8 @@</span><br><span> RUN       cd /tmp && git clone git://git.osmocom.org/nplab/m3ua-testtool</span><br><span> ADD   http://git.osmocom.org/nplab/m3ua-testtool/patch /tmp/commit</span><br><span> RUN     cd /tmp/m3ua-testtool && \</span><br><span style="color: hsl(0, 100%, 40%);">-      git pull && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git fetch && \</span><br><span style="color: hsl(120, 100%, 40%);">+        git checkout -f laforge/python3 && \</span><br><span>         cp runtest-junitxml.py /usr/local/bin/</span><br><span> </span><br><span> COPY      dotguile /root/.guile</span><br><span>diff --git a/nplab-m3ua-test/jenkins.sh b/nplab-m3ua-test/jenkins.sh</span><br><span>index c4250b0..87035f3 100755</span><br><span>--- a/nplab-m3ua-test/jenkins.sh</span><br><span>+++ b/nplab-m3ua-test/jenkins.sh</span><br><span>@@ -3,7 +3,7 @@</span><br><span> . ../jenkins-common.sh</span><br><span> IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"</span><br><span> docker_images_require \</span><br><span style="color: hsl(0, 100%, 40%);">-   "debian-stretch-build" \</span><br><span style="color: hsl(120, 100%, 40%);">+    "debian-buster-build" \</span><br><span>    "sigtran-tests" \</span><br><span>  "osmo-stp-$IMAGE_SUFFIX" \</span><br><span>         "debian-bullseye-titan" \</span><br><span>diff --git a/nplab-sua-test/jenkins.sh b/nplab-sua-test/jenkins.sh</span><br><span>index 0e59cd4..4be00c8 100755</span><br><span>--- a/nplab-sua-test/jenkins.sh</span><br><span>+++ b/nplab-sua-test/jenkins.sh</span><br><span>@@ -3,9 +3,9 @@</span><br><span> . ../jenkins-common.sh</span><br><span> IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"</span><br><span> docker_images_require \</span><br><span style="color: hsl(0, 100%, 40%);">- "debian-stretch-build" \</span><br><span style="color: hsl(120, 100%, 40%);">+    "debian-buster-build" \</span><br><span>    "osmo-stp-$IMAGE_SUFFIX" \</span><br><span style="color: hsl(0, 100%, 40%);">-    "debian-stretch-titan" \</span><br><span style="color: hsl(120, 100%, 40%);">+    "debian-bullseye-titan" \</span><br><span>  "sigtran-tests" \</span><br><span>  "nplab-sua-test"</span><br><span> </span><br><span>diff --git a/sigtran-tests/Dockerfile b/sigtran-tests/Dockerfile</span><br><span>index ebfb027..d7f7206 100644</span><br><span>--- a/sigtran-tests/Dockerfile</span><br><span>+++ b/sigtran-tests/Dockerfile</span><br><span>@@ -1,13 +1,13 @@</span><br><span> ARG  USER</span><br><span style="color: hsl(0, 100%, 40%);">-FROM        $USER/debian-stretch-build</span><br><span style="color: hsl(120, 100%, 40%);">+FROM        $USER/debian-buster-build</span><br><span> </span><br><span> MAINTAINER Harald Welte <laforge@gnumonks.org></span><br><span> </span><br><span> RUN        apt-get update && apt-get -y install            \</span><br><span>            guile-2.0 guile-2.0-dev gnulib tcsh \</span><br><span style="color: hsl(0, 100%, 40%);">-           python python-pip</span><br><span style="color: hsl(120, 100%, 40%);">+             python3 python3-pip</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-RUN      pip install junit-xml</span><br><span style="color: hsl(120, 100%, 40%);">+RUN      pip3 install junit-xml</span><br><span> </span><br><span> RUN       cd /tmp && git clone https://github.com/nplab/guile-sctp && \</span><br><span>        cd guile-sctp && \</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/docker-playground/+/26585">change 26585</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/+/26585"/><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: I30c05efbc6c7a21cad71b207e723ef958f1ac9be </div>
<div style="display:none"> Gerrit-Change-Number: 26585 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>