From f0554efa92cfe671b34e047c030bd1d9621af67a Mon Sep 17 00:00:00 2001
From: Harald Welte <laforge@osmocom.org>
Date: Wed, 15 Dec 2021 15:58:30 +0000
Subject: [PATCH] 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
---
 nplab-m3ua-test/Dockerfile | 5 +++--
 nplab-m3ua-test/jenkins.sh | 2 +-
 nplab-sua-test/Dockerfile  | 5 +++--
 nplab-sua-test/jenkins.sh  | 4 ++--
 sigtran-tests/Dockerfile   | 6 +++---
 5 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/nplab-m3ua-test/Dockerfile b/nplab-m3ua-test/Dockerfile
index ba5d17df..db993bdb 100644
--- a/nplab-m3ua-test/Dockerfile
+++ b/nplab-m3ua-test/Dockerfile
@@ -4,9 +4,10 @@ FROM $USER/sigtran-tests
 MAINTAINER Harald Welte <laforge@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 c4250b0f..87035f3a 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 f7f071a2..d62f6656 100644
--- a/nplab-sua-test/Dockerfile
+++ b/nplab-sua-test/Dockerfile
@@ -4,9 +4,10 @@ FROM $USER/sigtran-tests
 MAINTAINER Harald Welte <laforge@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 0e59cd45..4be00c84 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 ebfb0278..d7f72060 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@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 && \