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-bsc-test/jenkins.sh | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'ttcn3-bsc-test/jenkins.sh') 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 @@ docker run --rm \ --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 -- cgit v1.2.3