aboutsummaryrefslogtreecommitdiffstats
path: root/nplab-sua-test
diff options
context:
space:
mode:
authorHarald Welte <laforge@osmocom.org>2021-12-15 15:58:30 +0000
committerHarald Welte <laforge@osmocom.org>2021-12-16 11:40:17 +0100
commitf0554efa92cfe671b34e047c030bd1d9621af67a (patch)
treef8c35448f520f7e4dacbb5c0fdf1744a165dfe83 /nplab-sua-test
parentc3874143c020a982c445c4bd352541823353c7c3 (diff)
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
Diffstat (limited to 'nplab-sua-test')
-rw-r--r--nplab-sua-test/Dockerfile5
-rwxr-xr-xnplab-sua-test/jenkins.sh4
2 files changed, 5 insertions, 4 deletions
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 @@ 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 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"