Change in docker-playground[master]: nplab: Switch from stretch to buster

[osmith]

osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/26585 )

Change subject: nplab: Switch from stretch to buster
......................................................................

nplab: Switch from stretch to buster

The test suites require guile-2.0 so we have to stay with buster
and cannot upgrade to bullseye (guile-3.0 only).

Related: OS#4969
Change-Id: I30c05efbc6c7a21cad71b207e723ef958f1ac9be
---
M nplab-m3ua-test/Dockerfile
M nplab-m3ua-test/jenkins.sh
M nplab-sua-test/Dockerfile
M nplab-sua-test/jenkins.sh
M sigtran-tests/Dockerfile
5 files changed, 12 insertions(+), 10 deletions(-)

Approvals:
  osmith: Looks good to me, approved; Verified



diff --git a/nplab-m3ua-test/Dockerfile b/nplab-m3ua-test/Dockerfile
index ba5d17d..db993bd 100644
--- a/nplab-m3ua-test/Dockerfile
+++ b/nplab-m3ua-test/Dockerfile
@@ -4,9 +4,10 @@
 MAINTAINER Harald Welte <laforge at gnumonks.org>
 
 RUN	cd /tmp && git clone git://git.osmocom.org/nplab/m3ua-testtool
-ADD	http://git.osmocom.org/nplab/m3ua-testtool/patch /tmp/commit
+ADD	http://git.osmocom.org/nplab/m3ua-testtool/patch/?h=laforge/python3 /tmp/commit
 RUN	cd /tmp/m3ua-testtool && \
-	git pull && \
+	git fetch && \
+	git checkout -f laforge/python3 && \
 	cp runtest-junitxml.py /usr/local/bin/
 
 COPY	dotguile /root/.guile
diff --git a/nplab-m3ua-test/jenkins.sh b/nplab-m3ua-test/jenkins.sh
index c4250b0..87035f3 100755
--- a/nplab-m3ua-test/jenkins.sh
+++ b/nplab-m3ua-test/jenkins.sh
@@ -3,7 +3,7 @@
 . ../jenkins-common.sh
 IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"
 docker_images_require \
-	"debian-stretch-build" \
+	"debian-buster-build" \
 	"sigtran-tests" \
 	"osmo-stp-$IMAGE_SUFFIX" \
 	"debian-bullseye-titan" \
diff --git a/nplab-sua-test/Dockerfile b/nplab-sua-test/Dockerfile
index f7f071a..d62f665 100644
--- a/nplab-sua-test/Dockerfile
+++ b/nplab-sua-test/Dockerfile
@@ -4,9 +4,10 @@
 MAINTAINER Harald Welte <laforge at gnumonks.org>
 
 RUN	cd /tmp && git clone git://git.osmocom.org/nplab/sua-testtool
-ADD	http://git.osmocom.org/nplab/sua-testtool/patch /tmp/commit
+ADD	http://git.osmocom.org/nplab/sua-testtool/patch/?h=laforge/python3 /tmp/commit
 RUN	cd /tmp/sua-testtool && \
-	git pull && \
+	git fetch && \
+	git checkout -f laforge/python3 && \
 	cp runtest-junitxml.py /usr/local/bin/
 
 COPY	dotguile /root/.guile
diff --git a/nplab-sua-test/jenkins.sh b/nplab-sua-test/jenkins.sh
index 0e59cd4..4be00c8 100755
--- a/nplab-sua-test/jenkins.sh
+++ b/nplab-sua-test/jenkins.sh
@@ -3,9 +3,9 @@
 . ../jenkins-common.sh
 IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"
 docker_images_require \
-	"debian-stretch-build" \
+	"debian-buster-build" \
 	"osmo-stp-$IMAGE_SUFFIX" \
-	"debian-stretch-titan" \
+	"debian-bullseye-titan" \
 	"sigtran-tests" \
 	"nplab-sua-test"
 
diff --git a/sigtran-tests/Dockerfile b/sigtran-tests/Dockerfile
index ebfb027..d7f7206 100644
--- a/sigtran-tests/Dockerfile
+++ b/sigtran-tests/Dockerfile
@@ -1,13 +1,13 @@
 ARG	USER
-FROM	$USER/debian-stretch-build
+FROM	$USER/debian-buster-build
 
 MAINTAINER Harald Welte <laforge at gnumonks.org>
 
 RUN	apt-get update && apt-get -y install		\
 		guile-2.0 guile-2.0-dev gnulib tcsh \
-		python python-pip
+		python3 python3-pip
 
-RUN	pip install junit-xml
+RUN	pip3 install junit-xml
 
 RUN	cd /tmp && git clone https://github.com/nplab/guile-sctp && \
 	cd guile-sctp && \

-- 
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/26585
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I30c05efbc6c7a21cad71b207e723ef958f1ac9be
Gerrit-Change-Number: 26585
Gerrit-PatchSet: 4
Gerrit-Owner: laforge <laforge at osmocom.org>
Gerrit-Assignee: osmith <osmith at sysmocom.de>
Gerrit-Reviewer: osmith <osmith at sysmocom.de>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20211216/c63937c7/attachment.htm>