aboutsummaryrefslogtreecommitdiffstats
path: root/ttcn3-msc-test
diff options
context:
space:
mode:
authorOliver Smith <osmith@sysmocom.de>2018-10-16 11:15:42 +0200
committerOliver Smith <osmith@sysmocom.de>2018-10-26 10:19:05 +0200
commitccf62eb2312a582eca31602a293df5d5ea7d83d4 (patch)
tree0d01550f311e413abf6fb7012d814518892ab258 /ttcn3-msc-test
parenta89aa7f8037592e88c0f4a05473f6182561ce9b5 (diff)
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
Diffstat (limited to 'ttcn3-msc-test')
-rwxr-xr-xttcn3-msc-test/jenkins.sh11
1 files changed, 9 insertions, 2 deletions
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 @@ docker run --rm \
--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 @@ docker run --rm \
-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