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