From ccf62eb2312a582eca31602a293df5d5ea7d83d4 Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Tue, 16 Oct 2018 11:15:42 +0200 Subject: 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 --- ttcn3-sip-test/jenkins.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'ttcn3-sip-test') 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 @@ docker run --rm \ -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 -- cgit v1.2.3