Harald Welte has submitted this change and it was merged. (
https://gerrit.osmocom.org/11366 )
Change subject: jenkins.sh: IMAGE_SUFFIX, docker_images_require()
......................................................................
jenkins.sh: IMAGE_SUFFIX, docker_images_require()
Default value "master" of the IMAGE_SUFFIX environment variable can be
changed to "latest" to test the latest stable builds instead of the
nightly ones. Use docker_images_require() to make sure that the required
images are existing and up-to-date before running the tests.
Related: OS#3268
Change-Id: Idbb708ab16cb71bab5069127945b63388222369e
---
M m3ua-test/jenkins.sh
M sua-test/jenkins.sh
M ttcn3-bsc-test/jenkins-sccplite.sh
M ttcn3-bsc-test/jenkins.sh
M ttcn3-bts-test/jenkins.sh
M ttcn3-ggsn-test/jenkins.sh
M ttcn3-hlr-test/jenkins.sh
M ttcn3-mgw-test/jenkins.sh
M ttcn3-msc-test/jenkins.sh
M ttcn3-sgsn-test/jenkins.sh
M ttcn3-sip-test/jenkins.sh
11 files changed, 97 insertions(+), 18 deletions(-)
Approvals:
Harald Welte: Looks good to me, approved; Verified
diff --git a/m3ua-test/jenkins.sh b/m3ua-test/jenkins.sh
index 61f7c05..e69e827 100755
--- a/m3ua-test/jenkins.sh
+++ b/m3ua-test/jenkins.sh
@@ -1,6 +1,12 @@
#!/bin/sh
. ../jenkins-common.sh
+IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"
+docker_images_require \
+ "debian-jessie-build" \
+ "osmo-stp-$IMAGE_SUFFIX" \
+ "debian-stretch-titan" \
+ "m3ua-test"
mkdir $VOL_BASE_DIR/m3ua-tester
cp m3ua-param-testtool.scm all-sgp-tests.txt $VOL_BASE_DIR/m3ua-tester/
@@ -16,7 +22,7 @@
--network $NET_NAME --ip 172.18.7.200 \
-v $VOL_BASE_DIR/stp:/data \
--name ${BUILD_TAG}-stp \
- -d $REPO_USER/osmo-stp-master
+ -d $REPO_USER/osmo-stp-$IMAGE_SUFFIX
# start docker container with tests
docker run --rm \
diff --git a/sua-test/jenkins.sh b/sua-test/jenkins.sh
index 0f87b4e..5e8d4cb 100755
--- a/sua-test/jenkins.sh
+++ b/sua-test/jenkins.sh
@@ -1,6 +1,13 @@
#!/bin/sh
. ../jenkins-common.sh
+IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"
+docker_images_require \
+ "debian-jessie-build" \
+ "osmo-stp-$IMAGE_SUFFIX" \
+ "debian-stretch-titan" \
+ "sigtran-tests" \
+ "sua-test"
mkdir $VOL_BASE_DIR/sua-tester
cp sua-param-testtool-sgp.scm some-sua-sgp-tests.txt $VOL_BASE_DIR/sua-tester/
@@ -16,7 +23,7 @@
--network $NET_NAME --ip 172.18.6.200 \
-v $VOL_BASE_DIR/stp:/data \
--name ${BUILD_TAG}-stp \
- -d $REPO_USER/osmo-stp-master
+ -d $REPO_USER/osmo-stp-$IMAGE_SUFFIX
# start docker container with tests
docker run --rm \
diff --git a/ttcn3-bsc-test/jenkins-sccplite.sh
b/ttcn3-bsc-test/jenkins-sccplite.sh
index bceb0ec..0a6ecf3 100755
--- a/ttcn3-bsc-test/jenkins-sccplite.sh
+++ b/ttcn3-bsc-test/jenkins-sccplite.sh
@@ -1,6 +1,13 @@
#!/bin/sh
. ../jenkins-common.sh
+IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"
+docker_images_require \
+ "debian-jessie-build" \
+ "osmo-bsc-$IMAGE_SUFFIX" \
+ "osmo-bts-$IMAGE_SUFFIX" \
+ "debian-stretch-titan" \
+ "ttcn3-bsc-test"
#Make sure NET_NAME doesn't clash with the AoIP BSC test
NET_NAME=ttcn3-bsc_sccplite-test
@@ -18,14 +25,17 @@
--network $NET_NAME --ip 172.18.12.20 \
-v $VOL_BASE_DIR/bsc:/data \
--name ${BUILD_TAG}-bsc -d \
- $REPO_USER/osmo-bsc-master
+ $REPO_USER/osmo-bsc-$IMAGE_SUFFIX
for i in `seq 0 2`; do
echo Starting container with OML for BTS$i
docker run --rm \
--network $NET_NAME --ip 172.18.12.10$i \
--name ${BUILD_TAG}-bts$i -d \
- $REPO_USER/osmo-bts-master /usr/local/bin/respawn.sh
osmo-bts-omldummy 172.18.12.20 $((i + 1234)) 1
+ $REPO_USER/osmo-bts-$IMAGE_SUFFIX \
+ /usr/local/bin/respawn.sh \
+ osmo-bts-omldummy \
+ 172.18.12.20 $((i + 1234)) 1
done
echo Starting container with BSC testsuite
diff --git a/ttcn3-bsc-test/jenkins.sh b/ttcn3-bsc-test/jenkins.sh
index 7536396..ec8c23e 100755
--- a/ttcn3-bsc-test/jenkins.sh
+++ b/ttcn3-bsc-test/jenkins.sh
@@ -1,6 +1,14 @@
#!/bin/sh
. ../jenkins-common.sh
+IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"
+docker_images_require \
+ "debian-jessie-build" \
+ "osmo-stp-$IMAGE_SUFFIX" \
+ "osmo-bsc-$IMAGE_SUFFIX" \
+ "osmo-bts-$IMAGE_SUFFIX" \
+ "debian-stretch-titan" \
+ "ttcn3-bsc-test"
mkdir $VOL_BASE_DIR/bsc-tester
cp BSC_Tests.cfg $VOL_BASE_DIR/bsc-tester/
@@ -18,21 +26,23 @@
--network $NET_NAME --ip 172.18.2.200 \
-v $VOL_BASE_DIR/stp:/data \
--name ${BUILD_TAG}-stp -d \
- $REPO_USER/osmo-stp-master
+ $REPO_USER/osmo-stp-$IMAGE_SUFFIX
echo Starting container with BSC
docker run --rm \
--network $NET_NAME --ip 172.18.2.20 \
-v $VOL_BASE_DIR/bsc:/data \
--name ${BUILD_TAG}-bsc -d \
- $REPO_USER/osmo-bsc-master
+ $REPO_USER/osmo-bsc-$IMAGE_SUFFIX
for i in `seq 0 2`; do
echo Starting container with OML for BTS$i
docker run --rm \
--network $NET_NAME --ip 172.18.2.10$i \
--name ${BUILD_TAG}-bts$i -d \
- $REPO_USER/osmo-bts-master /usr/local/bin/respawn.sh
osmo-bts-omldummy 172.18.2.20 $((i + 1234)) 1
+ $REPO_USER/osmo-bts-$IMAGE_SUFFIX \
+ /usr/local/bin/respawn.sh \
+ osmo-bts-omldummy 172.18.2.20 $((i + 1234)) 1
done
echo Starting container with BSC testsuite
diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh
index fe448f5..e527cd7 100755
--- a/ttcn3-bts-test/jenkins.sh
+++ b/ttcn3-bts-test/jenkins.sh
@@ -1,6 +1,15 @@
#!/bin/sh
. ../jenkins-common.sh
+IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"
+# NOTE: there is no osmocom-bb-host-latest, hence always use master!
+docker_images_require \
+ "debian-jessie-build" \
+ "osmo-bsc-$IMAGE_SUFFIX" \
+ "osmo-bts-$IMAGE_SUFFIX" \
+ "osmocom-bb-host-master" \
+ "debian-stretch-titan" \
+ "ttcn3-bts-test"
network_create 172.18.9.0/24
@@ -24,7 +33,7 @@
--network $NET_NAME --ip 172.18.9.11 \
-v $VOL_BASE_DIR/bsc:/data \
--name ${BUILD_TAG}-bsc -d \
- $REPO_USER/osmo-bsc-master \
+ $REPO_USER/osmo-bsc-$IMAGE_SUFFIX \
/usr/local/bin/osmo-bsc -c /data/osmo-bsc.cfg
echo Starting container with BTS
@@ -33,7 +42,7 @@
-v $VOL_BASE_DIR/bts:/data \
-v $VOL_BASE_DIR/unix:/data/unix \
--name ${BUILD_TAG}-bts -d \
- $REPO_USER/osmo-bts-master \
+ $REPO_USER/osmo-bts-$IMAGE_SUFFIX \
/usr/local/bin/respawn.sh /usr/local/bin/osmo-bts-trx -c
/data/osmo-bts.cfg -i 172.18.9.10
echo Starting container with fake_trx
@@ -41,7 +50,7 @@
--network $NET_NAME --ip 172.18.9.21 \
-v $VOL_BASE_DIR/fake_trx:/data \
--name ${BUILD_TAG}-fake_trx -d \
- $REPO_USER/osmocom-bb-host-master \
+ $REPO_USER/osmocom-bb-host-$IMAGE_SUFFIX \
bash -c "/tmp/osmocom-bb/src/target/trx_toolkit/fake_trx.py -R
172.18.9.20 -r 172.18.9.22 >/data/fake_trx.log 2>&1"
echo Starting container with trxcon
@@ -49,7 +58,7 @@
--network $NET_NAME --ip 172.18.9.22 \
-v $VOL_BASE_DIR/unix:/data/unix \
--name ${BUILD_TAG}-trxcon -d \
- $REPO_USER/osmocom-bb-host-master \
+ $REPO_USER/osmocom-bb-host-$IMAGE_SUFFIX \
/usr/local/bin/trxcon -i 172.18.9.21 -s /data/unix/osmocom_l2
diff --git a/ttcn3-ggsn-test/jenkins.sh b/ttcn3-ggsn-test/jenkins.sh
index 2da6aed..40f3227 100755
--- a/ttcn3-ggsn-test/jenkins.sh
+++ b/ttcn3-ggsn-test/jenkins.sh
@@ -1,6 +1,12 @@
#!/bin/sh
. ../jenkins-common.sh
+IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"
+docker_images_require \
+ "debian-jessie-build" \
+ "osmo-ggsn-$IMAGE_SUFFIX" \
+ "debian-stretch-titan" \
+ "ttcn3-ggsn-test"
mkdir $VOL_BASE_DIR/ggsn-tester
cp GGSN_Tests.cfg $VOL_BASE_DIR/ggsn-tester/
@@ -18,7 +24,7 @@
--network $NET_NAME --ip 172.18.3.201 \
-v $VOL_BASE_DIR/ggsn:/data \
--name ${BUILD_TAG}-ggsn -d \
- $REPO_USER/osmo-ggsn-master
+ $REPO_USER/osmo-ggsn-$IMAGE_SUFFIX
# start docker container with testsuite in foreground
docker run --rm \
diff --git a/ttcn3-hlr-test/jenkins.sh b/ttcn3-hlr-test/jenkins.sh
index 5d208df..89669eb 100755
--- a/ttcn3-hlr-test/jenkins.sh
+++ b/ttcn3-hlr-test/jenkins.sh
@@ -1,6 +1,12 @@
#!/bin/sh
. ../jenkins-common.sh
+IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"
+docker_images_require \
+ "debian-jessie-build" \
+ "osmo-hlr-$IMAGE_SUFFIX" \
+ "debian-stretch-titan" \
+ "ttcn3-hlr-test"
network_create 172.18.10.0/24
@@ -15,7 +21,7 @@
--network $NET_NAME --ip 172.18.10.20 \
-v $VOL_BASE_DIR/hlr:/data \
--name ${BUILD_TAG}-hlr -d \
- $REPO_USER/osmo-hlr-master \
+ $REPO_USER/osmo-hlr-$IMAGE_SUFFIX \
/usr/local/bin/osmo-hlr
echo Starting container with HLR testsuite
diff --git a/ttcn3-mgw-test/jenkins.sh b/ttcn3-mgw-test/jenkins.sh
index ee624b9..4f836b7 100755
--- a/ttcn3-mgw-test/jenkins.sh
+++ b/ttcn3-mgw-test/jenkins.sh
@@ -1,6 +1,12 @@
#!/bin/sh
. ../jenkins-common.sh
+IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"
+docker_images_require \
+ "debian-jessie-build" \
+ "osmo-mgw-$IMAGE_SUFFIX" \
+ "debian-stretch-titan" \
+ "ttcn3-mgw-test"
mkdir $VOL_BASE_DIR/mgw-tester
cp MGCP_Test.cfg $VOL_BASE_DIR/mgw-tester/
@@ -15,7 +21,7 @@
--network $NET_NAME --ip 172.18.4.180 \
-v $VOL_BASE_DIR/mgw:/data \
--name ${BUILD_TAG}-mgw -d \
- $REPO_USER/osmo-mgw-master
+ $REPO_USER/osmo-mgw-$IMAGE_SUFFIX
# start docker container with testsuite in foreground
docker run --rm \
diff --git a/ttcn3-msc-test/jenkins.sh b/ttcn3-msc-test/jenkins.sh
index 560eea7..662c377 100755
--- a/ttcn3-msc-test/jenkins.sh
+++ b/ttcn3-msc-test/jenkins.sh
@@ -1,6 +1,13 @@
#!/bin/sh
. ../jenkins-common.sh
+IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"
+docker_images_require \
+ "debian-jessie-build" \
+ "osmo-stp-$IMAGE_SUFFIX" \
+ "osmo-msc-$IMAGE_SUFFIX" \
+ "debian-stretch-titan" \
+ "ttcn3-msc-test"
network_create 172.18.1.0/24
@@ -22,7 +29,7 @@
--network $NET_NAME --ip 172.18.1.200 \
-v $VOL_BASE_DIR/stp:/data \
--name ${BUILD_TAG}-stp -d \
- $REPO_USER/osmo-stp-master
+ $REPO_USER/osmo-stp-$IMAGE_SUFFIX
echo Starting container with MSC
docker run --rm \
@@ -30,7 +37,7 @@
-v $VOL_BASE_DIR/msc:/data \
-v $VOL_BASE_DIR/unix:/data/unix \
--name ${BUILD_TAG}-msc -d \
- $REPO_USER/osmo-msc-master \
+ $REPO_USER/osmo-msc-$IMAGE_SUFFIX \
/usr/local/bin/osmo-msc -M /data/unix/mncc
echo Starting container with MSC testsuite
diff --git a/ttcn3-sgsn-test/jenkins.sh b/ttcn3-sgsn-test/jenkins.sh
index f1481b1..9243e2b 100755
--- a/ttcn3-sgsn-test/jenkins.sh
+++ b/ttcn3-sgsn-test/jenkins.sh
@@ -1,6 +1,12 @@
#!/bin/sh
. ../jenkins-common.sh
+IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"
+docker_images_require \
+ "debian-jessie-build" \
+ "osmo-sgsn-$IMAGE_SUFFIX" \
+ "debian-stretch-titan" \
+ "ttcn3-sgsn-test"
network_create 172.18.8.0/24
@@ -17,7 +23,7 @@
--network $NET_NAME --ip 172.18.8.10 \
-v $VOL_BASE_DIR/sgsn:/data \
--name ${BUILD_TAG}-sgsn -d \
- $REPO_USER/osmo-sgsn-master \
+ $REPO_USER/osmo-sgsn-$IMAGE_SUFFIX \
/usr/local/bin/osmo-sgsn
echo Starting container with SGSN testsuite
diff --git a/ttcn3-sip-test/jenkins.sh b/ttcn3-sip-test/jenkins.sh
index 37a8e95..2dfd281 100755
--- a/ttcn3-sip-test/jenkins.sh
+++ b/ttcn3-sip-test/jenkins.sh
@@ -1,6 +1,12 @@
#!/bin/sh
. ../jenkins-common.sh
+IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"
+docker_images_require \
+ "debian-jessie-build" \
+ "osmo-sip-$IMAGE_SUFFIX" \
+ "debian-stretch-titan" \
+ "ttcn3-sip-test"
network_create 172.18.11.0/24
@@ -20,7 +26,7 @@
-v $VOL_BASE_DIR/sip:/data \
-v $VOL_BASE_DIR/unix:/data/unix \
--name ${BUILD_TAG}-sip-connector -d \
- $REPO_USER/osmo-sip-master \
+ $REPO_USER/osmo-sip-$IMAGE_SUFFIX \
/usr/local/bin/osmo-sip-connector -M /data/unix/mncc
echo Starting container with SIP testsuite
--
To view, visit https://gerrit.osmocom.org/11366
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Idbb708ab16cb71bab5069127945b63388222369e
Gerrit-Change-Number: 11366
Gerrit-PatchSet: 6
Gerrit-Owner: osmith <osm...@sysmocom.de>
Gerrit-Reviewer: Harald Welte <lafo...@gnumonks.org>
Gerrit-Reviewer: Neels Hofmeyr <nhofm...@sysmocom.de>
Gerrit-Reviewer: osmith <osm...@sysmocom.de>
