<p>osmith <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/docker-playground/+/23002">View Change</a></p><div style="white-space:pre-wrap">Approvals:
osmith: Looks good to me, approved; Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">*/jenkins.sh: set -e after setting clean up trap<br><br>Abort the script and trigger the clean up script, whenever any of the<br>commands below to prepare the testsuite are failing. This saves time<br>with figuring out why suddenly all or most tests are failing, and avoids<br>running the entire testsuite on jenkins if it's obviously not going to<br>work.<br><br>Related: OS#3208<br>Change-Id: Ie68da2affda8c96b3a515a857a921a05f1bf8ef7<br>---<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-cbc-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, 24 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/nplab-m3ua-test/jenkins.sh b/nplab-m3ua-test/jenkins.sh</span><br><span>index cd59c99..1e9a248 100755</span><br><span>--- a/nplab-m3ua-test/jenkins.sh</span><br><span>+++ b/nplab-m3ua-test/jenkins.sh</span><br><span>@@ -10,6 +10,7 @@</span><br><span> "nplab-m3ua-test"</span><br><span> </span><br><span> set_clean_up_trap</span><br><span style="color: hsl(120, 100%, 40%);">+set -e</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>diff --git a/nplab-sua-test/jenkins.sh b/nplab-sua-test/jenkins.sh</span><br><span>index baf1c9b..eeb0f06 100755</span><br><span>--- a/nplab-sua-test/jenkins.sh</span><br><span>+++ b/nplab-sua-test/jenkins.sh</span><br><span>@@ -10,6 +10,7 @@</span><br><span> "nplab-sua-test"</span><br><span> </span><br><span> set_clean_up_trap</span><br><span style="color: hsl(120, 100%, 40%);">+set -e</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>diff --git a/osmo-gsm-tester/jenkins.sh b/osmo-gsm-tester/jenkins.sh</span><br><span>index 4018dc0..ae645e7 100755</span><br><span>--- a/osmo-gsm-tester/jenkins.sh</span><br><span>+++ b/osmo-gsm-tester/jenkins.sh</span><br><span>@@ -59,6 +59,7 @@</span><br><span> "osmo-gsm-tester"</span><br><span> </span><br><span> set_clean_up_trap</span><br><span style="color: hsl(120, 100%, 40%);">+set -e</span><br><span> </span><br><span> SUBNET=50</span><br><span> network_create $SUBNET</span><br><span>diff --git a/ttcn3-bsc-test/jenkins-sccplite.sh b/ttcn3-bsc-test/jenkins-sccplite.sh</span><br><span>index 9bb49fb..bc6eaa0 100755</span><br><span>--- a/ttcn3-bsc-test/jenkins-sccplite.sh</span><br><span>+++ b/ttcn3-bsc-test/jenkins-sccplite.sh</span><br><span>@@ -8,6 +8,7 @@</span><br><span> "ttcn3-bsc-test"</span><br><span> </span><br><span> set_clean_up_trap</span><br><span style="color: hsl(120, 100%, 40%);">+set -e</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>diff --git a/ttcn3-bsc-test/jenkins.sh b/ttcn3-bsc-test/jenkins.sh</span><br><span>index 460ab38..18236a2 100755</span><br><span>--- a/ttcn3-bsc-test/jenkins.sh</span><br><span>+++ b/ttcn3-bsc-test/jenkins.sh</span><br><span>@@ -9,6 +9,7 @@</span><br><span> "ttcn3-bsc-test"</span><br><span> </span><br><span> set_clean_up_trap</span><br><span style="color: hsl(120, 100%, 40%);">+set -e</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>diff --git a/ttcn3-bscnat-test/jenkins.sh b/ttcn3-bscnat-test/jenkins.sh</span><br><span>index e0cd654..1182df0 100755</span><br><span>--- a/ttcn3-bscnat-test/jenkins.sh</span><br><span>+++ b/ttcn3-bscnat-test/jenkins.sh</span><br><span>@@ -7,6 +7,7 @@</span><br><span> "ttcn3-bscnat-test"</span><br><span> </span><br><span> set_clean_up_trap</span><br><span style="color: hsl(120, 100%, 40%);">+set -e</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>diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh</span><br><span>index 610b3c7..5fab160 100755</span><br><span>--- a/ttcn3-bts-test/jenkins.sh</span><br><span>+++ b/ttcn3-bts-test/jenkins.sh</span><br><span>@@ -10,6 +10,7 @@</span><br><span> "ttcn3-bts-test"</span><br><span> </span><br><span> set_clean_up_trap</span><br><span style="color: hsl(120, 100%, 40%);">+set -e</span><br><span> </span><br><span> clean_up() {</span><br><span> # append ':hopping' to the classnames,</span><br><span>diff --git a/ttcn3-cbc-test/jenkins.sh b/ttcn3-cbc-test/jenkins.sh</span><br><span>index d8735cf..5c2bf5d 100755</span><br><span>--- a/ttcn3-cbc-test/jenkins.sh</span><br><span>+++ b/ttcn3-cbc-test/jenkins.sh</span><br><span>@@ -7,6 +7,7 @@</span><br><span> "ttcn3-cbc-test"</span><br><span> </span><br><span> set_clean_up_trap</span><br><span style="color: hsl(120, 100%, 40%);">+set -e</span><br><span> </span><br><span> mkdir $VOL_BASE_DIR/cbc-tester</span><br><span> cp CBC_Tests.cfg $VOL_BASE_DIR/cbc-tester/</span><br><span>diff --git a/ttcn3-fr-test/jenkins.sh b/ttcn3-fr-test/jenkins.sh</span><br><span>index 0baafd7..ee76984 100755</span><br><span>--- a/ttcn3-fr-test/jenkins.sh</span><br><span>+++ b/ttcn3-fr-test/jenkins.sh</span><br><span>@@ -6,6 +6,7 @@</span><br><span> "ttcn3-fr-test"</span><br><span> </span><br><span> set_clean_up_trap</span><br><span style="color: hsl(120, 100%, 40%);">+set -e</span><br><span> </span><br><span> SUBNET=26</span><br><span> network_create $SUBNET</span><br><span>diff --git a/ttcn3-gbproxy-test-fr/jenkins.sh b/ttcn3-gbproxy-test-fr/jenkins.sh</span><br><span>index 2d1a46f..d1ecb0a 100755</span><br><span>--- a/ttcn3-gbproxy-test-fr/jenkins.sh</span><br><span>+++ b/ttcn3-gbproxy-test-fr/jenkins.sh</span><br><span>@@ -20,6 +20,7 @@</span><br><span> "ttcn3-gbproxy-test"</span><br><span> </span><br><span> set_clean_up_trap</span><br><span style="color: hsl(120, 100%, 40%);">+set -e</span><br><span> </span><br><span> SUBNET=25</span><br><span> network_create $SUBNET</span><br><span>diff --git a/ttcn3-gbproxy-test/jenkins.sh b/ttcn3-gbproxy-test/jenkins.sh</span><br><span>index b62b757..3595c16 100755</span><br><span>--- a/ttcn3-gbproxy-test/jenkins.sh</span><br><span>+++ b/ttcn3-gbproxy-test/jenkins.sh</span><br><span>@@ -7,6 +7,7 @@</span><br><span> "ttcn3-gbproxy-test"</span><br><span> </span><br><span> set_clean_up_trap</span><br><span style="color: hsl(120, 100%, 40%);">+set -e</span><br><span> </span><br><span> SUBNET=24</span><br><span> network_create $SUBNET</span><br><span>diff --git a/ttcn3-ggsn-test/jenkins.sh b/ttcn3-ggsn-test/jenkins.sh</span><br><span>index 674eb8d..95cbc2f 100755</span><br><span>--- a/ttcn3-ggsn-test/jenkins.sh</span><br><span>+++ b/ttcn3-ggsn-test/jenkins.sh</span><br><span>@@ -7,6 +7,7 @@</span><br><span> "ttcn3-ggsn-test"</span><br><span> </span><br><span> set_clean_up_trap</span><br><span style="color: hsl(120, 100%, 40%);">+set -e</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>diff --git a/ttcn3-hlr-test/jenkins.sh b/ttcn3-hlr-test/jenkins.sh</span><br><span>index 4dfb9aa..e003e03 100755</span><br><span>--- a/ttcn3-hlr-test/jenkins.sh</span><br><span>+++ b/ttcn3-hlr-test/jenkins.sh</span><br><span>@@ -7,6 +7,7 @@</span><br><span> "ttcn3-hlr-test"</span><br><span> </span><br><span> set_clean_up_trap</span><br><span style="color: hsl(120, 100%, 40%);">+set -e</span><br><span> </span><br><span> SUBNET=10</span><br><span> network_create $SUBNET</span><br><span>diff --git a/ttcn3-mgw-test/jenkins.sh b/ttcn3-mgw-test/jenkins.sh</span><br><span>index 87c1798..f9d0133 100755</span><br><span>--- a/ttcn3-mgw-test/jenkins.sh</span><br><span>+++ b/ttcn3-mgw-test/jenkins.sh</span><br><span>@@ -7,6 +7,7 @@</span><br><span> "ttcn3-mgw-test"</span><br><span> </span><br><span> set_clean_up_trap</span><br><span style="color: hsl(120, 100%, 40%);">+set -e</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>diff --git a/ttcn3-msc-test/jenkins.sh b/ttcn3-msc-test/jenkins.sh</span><br><span>index 373fa7e..dd91e24 100755</span><br><span>--- a/ttcn3-msc-test/jenkins.sh</span><br><span>+++ b/ttcn3-msc-test/jenkins.sh</span><br><span>@@ -8,6 +8,7 @@</span><br><span> "ttcn3-msc-test"</span><br><span> </span><br><span> set_clean_up_trap</span><br><span style="color: hsl(120, 100%, 40%);">+set -e</span><br><span> </span><br><span> SUBNET=20</span><br><span> network_create $SUBNET</span><br><span>diff --git a/ttcn3-nitb-sysinfo/jenkins.sh b/ttcn3-nitb-sysinfo/jenkins.sh</span><br><span>index d0ef972..e2cc494 100755</span><br><span>--- a/ttcn3-nitb-sysinfo/jenkins.sh</span><br><span>+++ b/ttcn3-nitb-sysinfo/jenkins.sh</span><br><span>@@ -3,6 +3,7 @@</span><br><span> . ../jenkins-common.sh</span><br><span> </span><br><span> set_clean_up_trap</span><br><span style="color: hsl(120, 100%, 40%);">+set -e</span><br><span> </span><br><span> clean_up() {</span><br><span> # start some stupid helper container so we can access the volume</span><br><span>diff --git a/ttcn3-pcu-test/jenkins-sns.sh b/ttcn3-pcu-test/jenkins-sns.sh</span><br><span>index f9e96ed..aaed27a 100755</span><br><span>--- a/ttcn3-pcu-test/jenkins-sns.sh</span><br><span>+++ b/ttcn3-pcu-test/jenkins-sns.sh</span><br><span>@@ -7,6 +7,7 @@</span><br><span> "ttcn3-pcu-test"</span><br><span> </span><br><span> set_clean_up_trap</span><br><span style="color: hsl(120, 100%, 40%);">+set -e</span><br><span> </span><br><span> SUBNET=14</span><br><span> network_create $SUBNET</span><br><span>diff --git a/ttcn3-pcu-test/jenkins.sh b/ttcn3-pcu-test/jenkins.sh</span><br><span>index 539b956..11c77ad 100755</span><br><span>--- a/ttcn3-pcu-test/jenkins.sh</span><br><span>+++ b/ttcn3-pcu-test/jenkins.sh</span><br><span>@@ -7,6 +7,7 @@</span><br><span> "ttcn3-pcu-test"</span><br><span> </span><br><span> set_clean_up_trap</span><br><span style="color: hsl(120, 100%, 40%);">+set -e</span><br><span> </span><br><span> SUBNET=13</span><br><span> network_create $SUBNET</span><br><span>diff --git a/ttcn3-remsim-test/jenkins.sh b/ttcn3-remsim-test/jenkins.sh</span><br><span>index 9a62581..ae013d6 100755</span><br><span>--- a/ttcn3-remsim-test/jenkins.sh</span><br><span>+++ b/ttcn3-remsim-test/jenkins.sh</span><br><span>@@ -7,6 +7,7 @@</span><br><span> "ttcn3-remsim-test"</span><br><span> </span><br><span> set_clean_up_trap</span><br><span style="color: hsl(120, 100%, 40%);">+set -e</span><br><span> </span><br><span> start_server() {</span><br><span> echo Starting container with osmo-remsim-server</span><br><span>diff --git a/ttcn3-sccp-test/jenkins.sh b/ttcn3-sccp-test/jenkins.sh</span><br><span>index c73e7c7..40ff1f1 100755</span><br><span>--- a/ttcn3-sccp-test/jenkins.sh</span><br><span>+++ b/ttcn3-sccp-test/jenkins.sh</span><br><span>@@ -8,6 +8,7 @@</span><br><span> "ttcn3-sccp-test"</span><br><span> </span><br><span> set_clean_up_trap</span><br><span style="color: hsl(120, 100%, 40%);">+set -e</span><br><span> </span><br><span> mkdir $VOL_BASE_DIR/sccp-tester</span><br><span> cp SCCP_Tests.cfg $VOL_BASE_DIR/sccp-tester/</span><br><span>diff --git a/ttcn3-sgsn-test/jenkins.sh b/ttcn3-sgsn-test/jenkins.sh</span><br><span>index 1cbc855..df500af 100755</span><br><span>--- a/ttcn3-sgsn-test/jenkins.sh</span><br><span>+++ b/ttcn3-sgsn-test/jenkins.sh</span><br><span>@@ -8,6 +8,7 @@</span><br><span> "ttcn3-sgsn-test"</span><br><span> </span><br><span> set_clean_up_trap</span><br><span style="color: hsl(120, 100%, 40%);">+set -e</span><br><span> </span><br><span> SUBNET=8</span><br><span> network_create $SUBNET</span><br><span>diff --git a/ttcn3-sip-test/jenkins.sh b/ttcn3-sip-test/jenkins.sh</span><br><span>index de9b87c..ffec3d2 100755</span><br><span>--- a/ttcn3-sip-test/jenkins.sh</span><br><span>+++ b/ttcn3-sip-test/jenkins.sh</span><br><span>@@ -7,6 +7,7 @@</span><br><span> "ttcn3-sip-test"</span><br><span> </span><br><span> set_clean_up_trap</span><br><span style="color: hsl(120, 100%, 40%);">+set -e</span><br><span> </span><br><span> SUBNET=11</span><br><span> network_create $SUBNET</span><br><span>diff --git a/ttcn3-smlc-test/jenkins.sh b/ttcn3-smlc-test/jenkins.sh</span><br><span>index 9e7f66c..f16536f 100755</span><br><span>--- a/ttcn3-smlc-test/jenkins.sh</span><br><span>+++ b/ttcn3-smlc-test/jenkins.sh</span><br><span>@@ -8,6 +8,7 @@</span><br><span> "ttcn3-smlc-test"</span><br><span> </span><br><span> set_clean_up_trap</span><br><span style="color: hsl(120, 100%, 40%);">+set -e</span><br><span> </span><br><span> mkdir $VOL_BASE_DIR/smlc-tester</span><br><span> cp SMLC_Tests.cfg $VOL_BASE_DIR/smlc-tester/</span><br><span>diff --git a/ttcn3-stp-test/jenkins.sh b/ttcn3-stp-test/jenkins.sh</span><br><span>index b15ae4b..db2ffdd 100755</span><br><span>--- a/ttcn3-stp-test/jenkins.sh</span><br><span>+++ b/ttcn3-stp-test/jenkins.sh</span><br><span>@@ -7,6 +7,7 @@</span><br><span> "ttcn3-stp-test"</span><br><span> </span><br><span> set_clean_up_trap</span><br><span style="color: hsl(120, 100%, 40%);">+set -e</span><br><span> </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></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/docker-playground/+/23002">change 23002</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/+/23002"/><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: Ie68da2affda8c96b3a515a857a921a05f1bf8ef7 </div>
<div style="display:none"> Gerrit-Change-Number: 23002 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>