osmocom
/
docker-playground
mirror of https://gerrit.osmocom.org/docker-playground
10
0
Fork 0
Code Releases Activity

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
changes/85/26585/4
Harald Welte 2021-12-15 15:58:30 +00:00
parent c3874143c0
commit f0554efa92
5 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nplab-m3ua-test/Dockerfile
View File

@ -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

2
nplab-m3ua-test/jenkins.sh
View File

@ -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" \

5
nplab-sua-test/Dockerfile
View File

@ -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

4
nplab-sua-test/jenkins.sh
View File

@ -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"

6
sigtran-tests/Dockerfile
View File

@ -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 && \