<p>osmith has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/docker-playground/+/23001">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">jenkins-common.sh: add common clean up trap<br><br>Add set_clean_up_trap() in jenkins-common.sh and run it at the beginning<br>of the jenkins.sh files. Move the common clean up code from the end of<br>every jenkins.sh file into clean_up_common(), which gets called by the<br>trap. Add a custom clean_up() function to those jenkins.sh files that<br>need additional clean up.<br><br>The motivation for this change is the upcoming optional build of initrd<br>and kernel during ttcn3-ggsn-test/jenkins.sh. After building these, a<br>short smoke test will be performed to make sure we can boot the kernel<br>and initrd, before continuing to run the entire testsuite against it. If<br>building or the smoke test fails, we must do a proper clean up of the<br>network and fix permissions.<br><br>Related: OS#3208<br>Change-Id: I807c6221d22fec31db23e2516e477a3eb43347fb<br>---<br>M jenkins-common.sh<br>M nplab-m3ua-test/jenkins.sh<br>M nplab-sua-test/jenkins.sh<br>M osmo-gsm-tester/jenkins.sh<br>M ttcn3-bsc-test/jenkins-sccplite.sh<br>M ttcn3-bsc-test/jenkins.sh<br>M ttcn3-bscnat-test/jenkins.sh<br>M ttcn3-bts-test/jenkins.sh<br>M ttcn3-fr-test/jenkins.sh<br>M ttcn3-gbproxy-test-fr/jenkins.sh<br>M ttcn3-gbproxy-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-nitb-sysinfo/jenkins.sh<br>M ttcn3-pcu-test/jenkins-sns.sh<br>M ttcn3-pcu-test/jenkins.sh<br>M ttcn3-remsim-test/jenkins.sh<br>M ttcn3-sccp-test/jenkins.sh<br>M ttcn3-sgsn-test/jenkins.sh<br>M ttcn3-sip-test/jenkins.sh<br>M ttcn3-smlc-test/jenkins.sh<br>M ttcn3-stp-test/jenkins.sh<br>24 files changed, 92 insertions(+), 171 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/01/23001/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/jenkins-common.sh b/jenkins-common.sh</span><br><span>index 1cfbbfc..b27f4bf 100644</span><br><span>--- a/jenkins-common.sh</span><br><span>+++ b/jenkins-common.sh</span><br><span>@@ -160,6 +160,30 @@</span><br><span>   cat "$VOL_BASE_DIR"/*/junit-*.log || true</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+clean_up_common() {</span><br><span style="color: hsl(120, 100%, 40%);">+     set +e</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+      # Clear trap</span><br><span style="color: hsl(120, 100%, 40%);">+  trap - EXIT INT TERM 0</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+      # Run clean_up() from ttcn3-*/jenkins.sh, if defined</span><br><span style="color: hsl(120, 100%, 40%);">+  if type clean_up >/dev/null; then</span><br><span style="color: hsl(120, 100%, 40%);">+          clean_up</span><br><span style="color: hsl(120, 100%, 40%);">+      fi</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+  network_clean</span><br><span style="color: hsl(120, 100%, 40%);">+ network_remove</span><br><span style="color: hsl(120, 100%, 40%);">+        rm -rf "$VOL_BASE_DIR"/unix</span><br><span style="color: hsl(120, 100%, 40%);">+ collect_logs</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+# Run clean up code when the script stops (either by failing command, by ^C, or</span><br><span style="color: hsl(120, 100%, 40%);">+# after running through successfully). The caller can define a custom clean_up</span><br><span style="color: hsl(120, 100%, 40%);">+# function.</span><br><span style="color: hsl(120, 100%, 40%);">+set_clean_up_trap() {</span><br><span style="color: hsl(120, 100%, 40%);">+        trap clean_up_common EXIT INT TERM 0</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> set -x</span><br><span> </span><br><span> # non-jenkins execution: assume local user name</span><br><span>diff --git a/nplab-m3ua-test/jenkins.sh b/nplab-m3ua-test/jenkins.sh</span><br><span>index fff96b7..cd59c99 100755</span><br><span>--- a/nplab-m3ua-test/jenkins.sh</span><br><span>+++ b/nplab-m3ua-test/jenkins.sh</span><br><span>@@ -9,6 +9,8 @@</span><br><span>    "debian-stretch-titan" \</span><br><span>   "nplab-m3ua-test"</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+set_clean_up_trap</span><br><span style="color: hsl(120, 100%, 40%);">+</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> </span><br><span>@@ -34,8 +36,3 @@</span><br><span>           -v $VOL_BASE_DIR/m3ua-tester:/data \</span><br><span>                 --name ${BUILD_TAG}-m3ua-test \</span><br><span>              $REPO_USER/nplab-m3ua-test > $VOL_BASE_DIR/junit-xml-m3ua.log</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-docker container stop -t 1 ${BUILD_TAG}-stp</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-network_remove</span><br><span style="color: hsl(0, 100%, 40%);">-collect_logs</span><br><span>diff --git a/nplab-sua-test/jenkins.sh b/nplab-sua-test/jenkins.sh</span><br><span>index d62ac29..baf1c9b 100755</span><br><span>--- a/nplab-sua-test/jenkins.sh</span><br><span>+++ b/nplab-sua-test/jenkins.sh</span><br><span>@@ -9,6 +9,8 @@</span><br><span>     "sigtran-tests" \</span><br><span>  "nplab-sua-test"</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+set_clean_up_trap</span><br><span style="color: hsl(120, 100%, 40%);">+</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> </span><br><span>@@ -34,8 +36,3 @@</span><br><span>              -v $VOL_BASE_DIR/sua-tester:/data \</span><br><span>          --name ${BUILD_TAG}-sua-test \</span><br><span>               $REPO_USER/nplab-sua-test > $VOL_BASE_DIR/junit-xml-sua.log</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-docker container stop -t 1 ${BUILD_TAG}-stp</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-network_remove</span><br><span style="color: hsl(0, 100%, 40%);">-collect_logs</span><br><span>diff --git a/osmo-gsm-tester/jenkins.sh b/osmo-gsm-tester/jenkins.sh</span><br><span>index 5d30f42..4018dc0 100755</span><br><span>--- a/osmo-gsm-tester/jenkins.sh</span><br><span>+++ b/osmo-gsm-tester/jenkins.sh</span><br><span>@@ -58,6 +58,8 @@</span><br><span>         "debian-stretch-jenkins" \</span><br><span>         "osmo-gsm-tester"</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+set_clean_up_trap</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> SUBNET=50</span><br><span> network_create $SUBNET</span><br><span> </span><br><span>@@ -101,12 +103,6 @@</span><br><span>               $REPO_USER/osmo-gsm-tester</span><br><span> rc=$?</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-echo Stopping containers</span><br><span style="color: hsl(0, 100%, 40%);">-docker container kill ${BUILD_TAG}-ogt-slave</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-network_remove</span><br><span style="color: hsl(0, 100%, 40%);">-collect_logs</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> RED='\033[0;31m'</span><br><span> GREEN='\033[0;32m'</span><br><span> NC='\033[0m' # No Color</span><br><span>diff --git a/ttcn3-bsc-test/jenkins-sccplite.sh b/ttcn3-bsc-test/jenkins-sccplite.sh</span><br><span>index ab8c06d..d1f1454 100755</span><br><span>--- a/ttcn3-bsc-test/jenkins-sccplite.sh</span><br><span>+++ b/ttcn3-bsc-test/jenkins-sccplite.sh</span><br><span>@@ -7,6 +7,8 @@</span><br><span>    "osmo-bts-$IMAGE_SUFFIX" \</span><br><span>         "ttcn3-bsc-test"</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+set_clean_up_trap</span><br><span style="color: hsl(120, 100%, 40%);">+</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> </span><br><span>@@ -55,12 +57,3 @@</span><br><span>             --name ${BUILD_TAG}-ttcn3-bsc-test \</span><br><span>                 $DOCKER_ARGS \</span><br><span>               $REPO_USER/ttcn3-bsc-test</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-echo Stopping containers</span><br><span style="color: hsl(0, 100%, 40%);">-for i in `seq 0 2`; do</span><br><span style="color: hsl(0, 100%, 40%);">- docker container kill ${BUILD_TAG}-bts$i</span><br><span style="color: hsl(0, 100%, 40%);">-done</span><br><span style="color: hsl(0, 100%, 40%);">-docker container kill ${BUILD_TAG}-bsc</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-network_remove</span><br><span style="color: hsl(0, 100%, 40%);">-collect_logs</span><br><span>diff --git a/ttcn3-bsc-test/jenkins.sh b/ttcn3-bsc-test/jenkins.sh</span><br><span>index cba378e..80f442b 100755</span><br><span>--- a/ttcn3-bsc-test/jenkins.sh</span><br><span>+++ b/ttcn3-bsc-test/jenkins.sh</span><br><span>@@ -8,6 +8,8 @@</span><br><span>      "osmo-bts-$IMAGE_SUFFIX" \</span><br><span>         "ttcn3-bsc-test"</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+set_clean_up_trap</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> mkdir $VOL_BASE_DIR/bsc-tester</span><br><span> cp BSC_Tests.cfg $VOL_BASE_DIR/bsc-tester/</span><br><span> </span><br><span>@@ -86,13 +88,3 @@</span><br><span>                 --name ${BUILD_TAG}-ttcn3-bsc-test \</span><br><span>                 $DOCKER_ARGS \</span><br><span>               $REPO_USER/ttcn3-bsc-test</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-echo Stopping containers</span><br><span style="color: hsl(0, 100%, 40%);">-for i in `seq 0 2`; do</span><br><span style="color: hsl(0, 100%, 40%);">- docker container kill ${BUILD_TAG}-bts$i</span><br><span style="color: hsl(0, 100%, 40%);">-done</span><br><span style="color: hsl(0, 100%, 40%);">-docker container kill ${BUILD_TAG}-bsc</span><br><span style="color: hsl(0, 100%, 40%);">-docker container kill ${BUILD_TAG}-stp</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-network_remove</span><br><span style="color: hsl(0, 100%, 40%);">-collect_logs</span><br><span>diff --git a/ttcn3-bscnat-test/jenkins.sh b/ttcn3-bscnat-test/jenkins.sh</span><br><span>index 9b04955..e0cd654 100755</span><br><span>--- a/ttcn3-bscnat-test/jenkins.sh</span><br><span>+++ b/ttcn3-bscnat-test/jenkins.sh</span><br><span>@@ -6,6 +6,7 @@</span><br><span>    "osmo-nitb-$IMAGE_SUFFIX" \</span><br><span>        "ttcn3-bscnat-test"</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+set_clean_up_trap</span><br><span> </span><br><span> mkdir $VOL_BASE_DIR/bscnat-tester</span><br><span> cp BSCNAT_Tests.cfg $VOL_BASE_DIR/bscnat-tester/</span><br><span>@@ -36,9 +37,3 @@</span><br><span>                --name ${BUILD_TAG}-ttcn3-bscnat-test \</span><br><span>              $DOCKER_ARGS \</span><br><span>               $REPO_USER/ttcn3-bscnat-test</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-echo Stopping containers</span><br><span style="color: hsl(0, 100%, 40%);">-docker container kill ${BUILD_TAG}-bscnat</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-network_remove</span><br><span style="color: hsl(0, 100%, 40%);">-collect_logs</span><br><span>diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh</span><br><span>index 87e2896..39ac7d4 100755</span><br><span>--- a/ttcn3-bts-test/jenkins.sh</span><br><span>+++ b/ttcn3-bts-test/jenkins.sh</span><br><span>@@ -9,6 +9,17 @@</span><br><span>  "osmocom-bb-host-master" \</span><br><span>         "ttcn3-bts-test"</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+set_clean_up_trap</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+clean_up() {</span><br><span style="color: hsl(120, 100%, 40%);">+     # append ':hopping' to the classnames,</span><br><span style="color: hsl(120, 100%, 40%);">+        # e.g. "classname='BTS_Tests'" => "classname='BTS_Tests:hopping'"</span><br><span style="color: hsl(120, 100%, 40%);">+      # e.g. "classname='BTS_Tests_SMSCB'" => "classname='BTS_Tests_SMSCB:hopping'"</span><br><span style="color: hsl(120, 100%, 40%);">+  # so the hopping test cases would not interfere with non-hopping ones in Jenkins</span><br><span style="color: hsl(120, 100%, 40%);">+      sed -i "s/classname='\([^']\+\)'/classname='\1:hopping'/g" \</span><br><span style="color: hsl(120, 100%, 40%);">+            $VOL_BASE_DIR/bts-tester-hopping/junit-xml-hopping-*.log</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> start_bsc() {</span><br><span>       echo Starting container with BSC</span><br><span>     docker run      --rm \</span><br><span>@@ -180,20 +191,3 @@</span><br><span> start_bsc</span><br><span> start_bts trx 1</span><br><span> start_testsuite hopping</span><br><span style="color: hsl(0, 100%, 40%);">-# append ':hopping' to the classnames,</span><br><span style="color: hsl(0, 100%, 40%);">-# e.g. "classname='BTS_Tests'" => "classname='BTS_Tests:hopping'"</span><br><span style="color: hsl(0, 100%, 40%);">-# e.g. "classname='BTS_Tests_SMSCB'" => "classname='BTS_Tests_SMSCB:hopping'"</span><br><span style="color: hsl(0, 100%, 40%);">-# so the hopping test cases would not interfere with non-hopping ones in Jenkins</span><br><span style="color: hsl(0, 100%, 40%);">-sed -i "s/classname='\([^']\+\)'/classname='\1:hopping'/g" \</span><br><span style="color: hsl(0, 100%, 40%);">-    $VOL_BASE_DIR/bts-tester-hopping/junit-xml-hopping-*.log</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-echo Stopping containers</span><br><span style="color: hsl(0, 100%, 40%);">-docker container kill ${BUILD_TAG}-trxcon</span><br><span style="color: hsl(0, 100%, 40%);">-docker container kill ${BUILD_TAG}-fake_trx</span><br><span style="color: hsl(0, 100%, 40%);">-docker container kill ${BUILD_TAG}-bsc</span><br><span style="color: hsl(0, 100%, 40%);">-docker container kill ${BUILD_TAG}-bts</span><br><span style="color: hsl(0, 100%, 40%);">-docker container kill ${BUILD_TAG}-bsc</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-network_remove</span><br><span style="color: hsl(0, 100%, 40%);">-rm -rf $VOL_BASE_DIR/unix</span><br><span style="color: hsl(0, 100%, 40%);">-collect_logs</span><br><span>diff --git a/ttcn3-fr-test/jenkins.sh b/ttcn3-fr-test/jenkins.sh</span><br><span>index faf8170..e0a758c 100755</span><br><span>--- a/ttcn3-fr-test/jenkins.sh</span><br><span>+++ b/ttcn3-fr-test/jenkins.sh</span><br><span>@@ -5,6 +5,8 @@</span><br><span> docker_images_require \</span><br><span>  "ttcn3-fr-test"</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+set_clean_up_trap</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> SUBNET=26</span><br><span> network_create $SUBNET</span><br><span> </span><br><span>@@ -64,10 +66,3 @@</span><br><span> # emulate running container in foreground, which is no longer possible as we</span><br><span> # must shift the net-devices into the container _after_ it is started</span><br><span> docker logs      -f ${BUILD_TAG}-ttcn3-fr-test</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-echo Stopping containers</span><br><span style="color: hsl(0, 100%, 40%);">-docker container kill ${BUILD_TAG}-frnet</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-network_remove</span><br><span style="color: hsl(0, 100%, 40%);">-collect_logs</span><br><span>diff --git a/ttcn3-gbproxy-test-fr/jenkins.sh b/ttcn3-gbproxy-test-fr/jenkins.sh</span><br><span>index 4ef2ace..a636df1 100755</span><br><span>--- a/ttcn3-gbproxy-test-fr/jenkins.sh</span><br><span>+++ b/ttcn3-gbproxy-test-fr/jenkins.sh</span><br><span>@@ -19,6 +19,8 @@</span><br><span>     "osmo-gbproxy-$IMAGE_SUFFIX" \</span><br><span>     "ttcn3-gbproxy-test"</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+set_clean_up_trap</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> SUBNET=25</span><br><span> network_create $SUBNET</span><br><span> </span><br><span>@@ -77,9 +79,3 @@</span><br><span> # emulate runnign container in foreground, which is no longer possible as we</span><br><span> # must shift the net-devices into the container _after_ it is started</span><br><span> docker logs  -f ${BUILD_TAG}-ttcn3-gbproxy-test</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-echo Stopping containers</span><br><span style="color: hsl(0, 100%, 40%);">-docker container kill ${BUILD_TAG}-gbproxy</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-network_remove</span><br><span style="color: hsl(0, 100%, 40%);">-collect_logs</span><br><span>diff --git a/ttcn3-gbproxy-test/jenkins.sh b/ttcn3-gbproxy-test/jenkins.sh</span><br><span>index b063c7f..4d30c83 100755</span><br><span>--- a/ttcn3-gbproxy-test/jenkins.sh</span><br><span>+++ b/ttcn3-gbproxy-test/jenkins.sh</span><br><span>@@ -6,6 +6,8 @@</span><br><span>    "osmo-gbproxy-$IMAGE_SUFFIX" \</span><br><span>     "ttcn3-gbproxy-test"</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+set_clean_up_trap</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> SUBNET=24</span><br><span> network_create $SUBNET</span><br><span> </span><br><span>@@ -44,9 +46,3 @@</span><br><span>               --name ${BUILD_TAG}-ttcn3-gbproxy-test \</span><br><span>             $DOCKER_ARGS \</span><br><span>               $REPO_USER/ttcn3-gbproxy-test $@</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-echo Stopping containers</span><br><span style="color: hsl(0, 100%, 40%);">-docker container kill ${BUILD_TAG}-gbproxy</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-network_remove</span><br><span style="color: hsl(0, 100%, 40%);">-collect_logs</span><br><span>diff --git a/ttcn3-ggsn-test/jenkins.sh b/ttcn3-ggsn-test/jenkins.sh</span><br><span>index 0aabe8a..674eb8d 100755</span><br><span>--- a/ttcn3-ggsn-test/jenkins.sh</span><br><span>+++ b/ttcn3-ggsn-test/jenkins.sh</span><br><span>@@ -6,6 +6,8 @@</span><br><span>  "osmo-ggsn-$IMAGE_SUFFIX" \</span><br><span>        "ttcn3-ggsn-test"</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+set_clean_up_trap</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> mkdir $VOL_BASE_DIR/ggsn-tester</span><br><span> cp GGSN_Tests.cfg $VOL_BASE_DIR/ggsn-tester/</span><br><span> </span><br><span>@@ -38,9 +40,3 @@</span><br><span>              --name ${BUILD_TAG}-ggsn-test \</span><br><span>              $DOCKER_ARGS \</span><br><span>               $REPO_USER/ttcn3-ggsn-test</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-# stop GGSN after test has completed</span><br><span style="color: hsl(0, 100%, 40%);">-docker container stop ${BUILD_TAG}-ggsn</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-network_remove</span><br><span style="color: hsl(0, 100%, 40%);">-collect_logs</span><br><span>diff --git a/ttcn3-hlr-test/jenkins.sh b/ttcn3-hlr-test/jenkins.sh</span><br><span>index 93ba6c3..e5bf0ee 100755</span><br><span>--- a/ttcn3-hlr-test/jenkins.sh</span><br><span>+++ b/ttcn3-hlr-test/jenkins.sh</span><br><span>@@ -6,6 +6,8 @@</span><br><span>   "osmo-hlr-$IMAGE_SUFFIX" \</span><br><span>         "ttcn3-hlr-test"</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+set_clean_up_trap</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> SUBNET=10</span><br><span> network_create $SUBNET</span><br><span> </span><br><span>@@ -40,9 +42,3 @@</span><br><span>           --name ${BUILD_TAG}-ttcn3-hlr-test \</span><br><span>                 $DOCKER_ARGS \</span><br><span>               $REPO_USER/ttcn3-hlr-test</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-echo Stopping containers</span><br><span style="color: hsl(0, 100%, 40%);">-docker container kill ${BUILD_TAG}-hlr</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-network_remove</span><br><span style="color: hsl(0, 100%, 40%);">-collect_logs</span><br><span>diff --git a/ttcn3-mgw-test/jenkins.sh b/ttcn3-mgw-test/jenkins.sh</span><br><span>index c49096b..65e4e76 100755</span><br><span>--- a/ttcn3-mgw-test/jenkins.sh</span><br><span>+++ b/ttcn3-mgw-test/jenkins.sh</span><br><span>@@ -6,6 +6,8 @@</span><br><span>         "osmo-mgw-$IMAGE_SUFFIX" \</span><br><span>         "ttcn3-mgw-test"</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+set_clean_up_trap</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> mkdir $VOL_BASE_DIR/mgw-tester</span><br><span> cp MGCP_Test.cfg $VOL_BASE_DIR/mgw-tester/</span><br><span> </span><br><span>@@ -42,9 +44,3 @@</span><br><span>          --name ${BUILD_TAG}-ttcn3-mgw-test \</span><br><span>                 $DOCKER_ARGS \</span><br><span>               $REPO_USER/ttcn3-mgw-test</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-# stop mgw after test has completed</span><br><span style="color: hsl(0, 100%, 40%);">-docker container stop ${BUILD_TAG}-mgw</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-network_remove</span><br><span style="color: hsl(0, 100%, 40%);">-collect_logs</span><br><span>diff --git a/ttcn3-msc-test/jenkins.sh b/ttcn3-msc-test/jenkins.sh</span><br><span>index c67fb5e..e3f7b4b 100755</span><br><span>--- a/ttcn3-msc-test/jenkins.sh</span><br><span>+++ b/ttcn3-msc-test/jenkins.sh</span><br><span>@@ -7,6 +7,8 @@</span><br><span>      "osmo-msc-$IMAGE_SUFFIX" \</span><br><span>         "ttcn3-msc-test"</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+set_clean_up_trap</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> SUBNET=20</span><br><span> network_create $SUBNET</span><br><span> </span><br><span>@@ -70,11 +72,3 @@</span><br><span>          --name ${BUILD_TAG}-ttcn3-msc-test \</span><br><span>                 $DOCKER_ARGS \</span><br><span>               $REPO_USER/ttcn3-msc-test</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-echo Stopping containers</span><br><span style="color: hsl(0, 100%, 40%);">-docker container kill ${BUILD_TAG}-msc</span><br><span style="color: hsl(0, 100%, 40%);">-docker container kill ${BUILD_TAG}-stp</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-network_remove</span><br><span style="color: hsl(0, 100%, 40%);">-rm -rf $VOL_BASE_DIR/unix</span><br><span style="color: hsl(0, 100%, 40%);">-collect_logs</span><br><span>diff --git a/ttcn3-nitb-sysinfo/jenkins.sh b/ttcn3-nitb-sysinfo/jenkins.sh</span><br><span>index c31ad6d..d0ef972 100755</span><br><span>--- a/ttcn3-nitb-sysinfo/jenkins.sh</span><br><span>+++ b/ttcn3-nitb-sysinfo/jenkins.sh</span><br><span>@@ -2,6 +2,22 @@</span><br><span> </span><br><span> . ../jenkins-common.sh</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+set_clean_up_trap</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+clean_up() {</span><br><span style="color: hsl(120, 100%, 40%);">+     # start some stupid helper container so we can access the volume</span><br><span style="color: hsl(120, 100%, 40%);">+      docker run      --rm \</span><br><span style="color: hsl(120, 100%, 40%);">+                -v ttcn3-nitb-sysinfo-vol:/ttcn3-nitb-sysinfo \</span><br><span style="color: hsl(120, 100%, 40%);">+               -v nitb-vol:/nitb \</span><br><span style="color: hsl(120, 100%, 40%);">+           -v bts-vol:/bts \</span><br><span style="color: hsl(120, 100%, 40%);">+             --name ${BUILD_TAG}-sysinfo-helper -d \</span><br><span style="color: hsl(120, 100%, 40%);">+               busybox /bin/sh -c 'sleep 1000 & wait'</span><br><span style="color: hsl(120, 100%, 40%);">+    docker cp ${BUILD_TAG}-sysinfo-helper:/ttcn3-nitb-sysinfo $VOL_BASE_DIR</span><br><span style="color: hsl(120, 100%, 40%);">+       docker cp ${BUILD_TAG}-sysinfo-helper:/nitb $VOL_BASE_DIR</span><br><span style="color: hsl(120, 100%, 40%);">+     docker cp ${BUILD_TAG}-sysinfo-helper:/bts $VOL_BASE_DIR</span><br><span style="color: hsl(120, 100%, 40%);">+      docker container stop -t 0 ${BUILD_TAG}-sysinfo-helper</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> SUBNET=5</span><br><span> network_create $SUBNET</span><br><span> </span><br><span>@@ -35,22 +51,3 @@</span><br><span>           -v ttcn3-nitb-sysinfo-vol:/data \</span><br><span>            --name ${BUILD_TAG}-ttcn3-nitb-sysinfo \</span><br><span>             $REPO_USER/ttcn3-nitb-sysinfo</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-# stop bts + nitb after test has completed</span><br><span style="color: hsl(0, 100%, 40%);">-docker container stop ${BUILD_TAG}-bts</span><br><span style="color: hsl(0, 100%, 40%);">-docker container stop ${BUILD_TAG}-nitb</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-# start some stupid helper container so we can access the volume</span><br><span style="color: hsl(0, 100%, 40%);">-docker run  --rm \</span><br><span style="color: hsl(0, 100%, 40%);">-          -v ttcn3-nitb-sysinfo-vol:/ttcn3-nitb-sysinfo \</span><br><span style="color: hsl(0, 100%, 40%);">-         -v nitb-vol:/nitb \</span><br><span style="color: hsl(0, 100%, 40%);">-             -v bts-vol:/bts \</span><br><span style="color: hsl(0, 100%, 40%);">-               --name ${BUILD_TAG}-sysinfo-helper -d \</span><br><span style="color: hsl(0, 100%, 40%);">-         busybox /bin/sh -c 'sleep 1000 & wait'</span><br><span style="color: hsl(0, 100%, 40%);">-docker cp ${BUILD_TAG}-sysinfo-helper:/ttcn3-nitb-sysinfo $VOL_BASE_DIR</span><br><span style="color: hsl(0, 100%, 40%);">-docker cp ${BUILD_TAG}-sysinfo-helper:/nitb $VOL_BASE_DIR</span><br><span style="color: hsl(0, 100%, 40%);">-docker cp ${BUILD_TAG}-sysinfo-helper:/bts $VOL_BASE_DIR</span><br><span style="color: hsl(0, 100%, 40%);">-docker container stop -t 0 ${BUILD_TAG}-sysinfo-helper</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-network_remove</span><br><span style="color: hsl(0, 100%, 40%);">-collect_logs</span><br><span>diff --git a/ttcn3-pcu-test/jenkins-sns.sh b/ttcn3-pcu-test/jenkins-sns.sh</span><br><span>index ee0b08a..fd2aeda 100755</span><br><span>--- a/ttcn3-pcu-test/jenkins-sns.sh</span><br><span>+++ b/ttcn3-pcu-test/jenkins-sns.sh</span><br><span>@@ -6,6 +6,8 @@</span><br><span>        "osmo-pcu-$IMAGE_SUFFIX" \</span><br><span>         "ttcn3-pcu-test"</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+set_clean_up_trap</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> SUBNET=14</span><br><span> network_create $SUBNET</span><br><span> </span><br><span>@@ -56,10 +58,3 @@</span><br><span>          --name ${BUILD_TAG}-ttcn3-pcu-test-sns \</span><br><span>             $DOCKER_ARGS \</span><br><span>               $REPO_USER/ttcn3-pcu-test</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-echo Stopping containers</span><br><span style="color: hsl(0, 100%, 40%);">-docker container kill ${BUILD_TAG}-pcu-sns</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-network_remove</span><br><span style="color: hsl(0, 100%, 40%);">-rm -rf $VOL_BASE_DIR/unix</span><br><span style="color: hsl(0, 100%, 40%);">-collect_logs</span><br><span>diff --git a/ttcn3-pcu-test/jenkins.sh b/ttcn3-pcu-test/jenkins.sh</span><br><span>index c2ef0d5..33c0aec 100755</span><br><span>--- a/ttcn3-pcu-test/jenkins.sh</span><br><span>+++ b/ttcn3-pcu-test/jenkins.sh</span><br><span>@@ -6,6 +6,8 @@</span><br><span>    "osmo-pcu-$IMAGE_SUFFIX" \</span><br><span>         "ttcn3-pcu-test"</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+set_clean_up_trap</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> SUBNET=13</span><br><span> network_create $SUBNET</span><br><span> </span><br><span>@@ -59,10 +61,3 @@</span><br><span>          --name ${BUILD_TAG}-ttcn3-pcu-test \</span><br><span>                 $DOCKER_ARGS \</span><br><span>               $REPO_USER/ttcn3-pcu-test</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-echo Stopping containers</span><br><span style="color: hsl(0, 100%, 40%);">-docker container kill ${BUILD_TAG}-pcu</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-network_remove</span><br><span style="color: hsl(0, 100%, 40%);">-rm -rf $VOL_BASE_DIR/unix</span><br><span style="color: hsl(0, 100%, 40%);">-collect_logs</span><br><span>diff --git a/ttcn3-remsim-test/jenkins.sh b/ttcn3-remsim-test/jenkins.sh</span><br><span>index 58279b9..9a62581 100755</span><br><span>--- a/ttcn3-remsim-test/jenkins.sh</span><br><span>+++ b/ttcn3-remsim-test/jenkins.sh</span><br><span>@@ -6,6 +6,8 @@</span><br><span>    "osmo-remsim-$IMAGE_SUFFIX" \</span><br><span>      "ttcn3-remsim-test"</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+set_clean_up_trap</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> start_server() {</span><br><span>   echo Starting container with osmo-remsim-server</span><br><span>      docker run      --rm \</span><br><span>@@ -87,7 +89,3 @@</span><br><span> start_client</span><br><span> cp client/REMSIM_Tests.cfg $VOL_BASE_DIR/remsim-tester/</span><br><span> start_testsuite</span><br><span style="color: hsl(0, 100%, 40%);">-docker container kill ${BUILD_TAG}-client</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-network_remove</span><br><span style="color: hsl(0, 100%, 40%);">-collect_logs</span><br><span>diff --git a/ttcn3-sccp-test/jenkins.sh b/ttcn3-sccp-test/jenkins.sh</span><br><span>index b47589c..c73e7c7 100755</span><br><span>--- a/ttcn3-sccp-test/jenkins.sh</span><br><span>+++ b/ttcn3-sccp-test/jenkins.sh</span><br><span>@@ -7,6 +7,8 @@</span><br><span>   "osmo-stp-master" \</span><br><span>        "ttcn3-sccp-test"</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+set_clean_up_trap</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> mkdir $VOL_BASE_DIR/sccp-tester</span><br><span> cp SCCP_Tests.cfg $VOL_BASE_DIR/sccp-tester/</span><br><span> </span><br><span>@@ -36,8 +38,3 @@</span><br><span>              --name ${BUILD_TAG}-ttcn3-sccp-test \</span><br><span>                $DOCKER_ARGS \</span><br><span>               $REPO_USER/ttcn3-sccp-test</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-docker container kill ${BUILD_TAG}-stp</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-network_remove</span><br><span style="color: hsl(0, 100%, 40%);">-collect_logs</span><br><span>diff --git a/ttcn3-sgsn-test/jenkins.sh b/ttcn3-sgsn-test/jenkins.sh</span><br><span>index 35eaf2e..b688ce1 100755</span><br><span>--- a/ttcn3-sgsn-test/jenkins.sh</span><br><span>+++ b/ttcn3-sgsn-test/jenkins.sh</span><br><span>@@ -7,6 +7,8 @@</span><br><span>    "osmo-sgsn-$IMAGE_SUFFIX" \</span><br><span>        "ttcn3-sgsn-test"</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+set_clean_up_trap</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> SUBNET=8</span><br><span> network_create $SUBNET</span><br><span> </span><br><span>@@ -57,10 +59,3 @@</span><br><span>          --name ${BUILD_TAG}-ttcn3-sgsn-test \</span><br><span>                $DOCKER_ARGS \</span><br><span>               $REPO_USER/ttcn3-sgsn-test</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-echo Stopping containers</span><br><span style="color: hsl(0, 100%, 40%);">-docker container kill ${BUILD_TAG}-sgsn</span><br><span style="color: hsl(0, 100%, 40%);">-docker container kill ${BUILD_TAG}-stp</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-network_remove</span><br><span style="color: hsl(0, 100%, 40%);">-collect_logs</span><br><span>diff --git a/ttcn3-sip-test/jenkins.sh b/ttcn3-sip-test/jenkins.sh</span><br><span>index af5e40b..fa7e7cb 100755</span><br><span>--- a/ttcn3-sip-test/jenkins.sh</span><br><span>+++ b/ttcn3-sip-test/jenkins.sh</span><br><span>@@ -6,6 +6,8 @@</span><br><span>         "osmo-sip-$IMAGE_SUFFIX" \</span><br><span>         "ttcn3-sip-test"</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+set_clean_up_trap</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> SUBNET=11</span><br><span> network_create $SUBNET</span><br><span> </span><br><span>@@ -46,10 +48,3 @@</span><br><span>          --name ${BUILD_TAG}-ttcn3-sip-test \</span><br><span>                 $DOCKER_ARGS \</span><br><span>               $REPO_USER/ttcn3-sip-test</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-echo Stopping containers</span><br><span style="color: hsl(0, 100%, 40%);">-docker container kill ${BUILD_TAG}-sip-connector</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-network_remove</span><br><span style="color: hsl(0, 100%, 40%);">-rm -rf $VOL_BASE_DIR/unix</span><br><span style="color: hsl(0, 100%, 40%);">-collect_logs</span><br><span>diff --git a/ttcn3-smlc-test/jenkins.sh b/ttcn3-smlc-test/jenkins.sh</span><br><span>index ba824c1..9e7f66c 100755</span><br><span>--- a/ttcn3-smlc-test/jenkins.sh</span><br><span>+++ b/ttcn3-smlc-test/jenkins.sh</span><br><span>@@ -7,6 +7,8 @@</span><br><span>  "osmo-smlc-$IMAGE_SUFFIX" \</span><br><span>        "ttcn3-smlc-test"</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+set_clean_up_trap</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> mkdir $VOL_BASE_DIR/smlc-tester</span><br><span> cp SMLC_Tests.cfg $VOL_BASE_DIR/smlc-tester/</span><br><span> </span><br><span>@@ -47,10 +49,3 @@</span><br><span>             --name ${BUILD_TAG}-ttcn3-smlc-test \</span><br><span>                $DOCKER_ARGS \</span><br><span>               $REPO_USER/ttcn3-smlc-test</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-echo Stopping containers</span><br><span style="color: hsl(0, 100%, 40%);">-docker container kill ${BUILD_TAG}-smlc</span><br><span style="color: hsl(0, 100%, 40%);">-docker container kill ${BUILD_TAG}-stp</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-network_remove</span><br><span style="color: hsl(0, 100%, 40%);">-collect_logs</span><br><span>diff --git a/ttcn3-stp-test/jenkins.sh b/ttcn3-stp-test/jenkins.sh</span><br><span>index 9ea97cb..ff7f7ed 100755</span><br><span>--- a/ttcn3-stp-test/jenkins.sh</span><br><span>+++ b/ttcn3-stp-test/jenkins.sh</span><br><span>@@ -6,6 +6,8 @@</span><br><span>         "osmo-stp-$IMAGE_SUFFIX" \</span><br><span>         "ttcn3-stp-test"</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+set_clean_up_trap</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> mkdir $VOL_BASE_DIR/stp-tester</span><br><span> cp STP_Tests.cfg $VOL_BASE_DIR/stp-tester/</span><br><span> </span><br><span>@@ -40,8 +42,3 @@</span><br><span>          --name ${BUILD_TAG}-ttcn3-stp-test \</span><br><span>                 $DOCKER_ARGS \</span><br><span>               $REPO_USER/ttcn3-stp-test</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-docker container kill ${BUILD_TAG}-stp</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-network_remove</span><br><span style="color: hsl(0, 100%, 40%);">-collect_logs</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/docker-playground/+/23001">change 23001</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/c/docker-playground/+/23001"/><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-Change-Id: I807c6221d22fec31db23e2516e477a3eb43347fb </div>
<div style="display:none"> Gerrit-Change-Number: 23001 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>