Change in docker-playground[master]: */jenkins.sh: set -e after setting clean up trap

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

osmith gerrit-no-reply at lists.osmocom.org
Fri Feb 26 08:34:39 UTC 2021


osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23002 )

Change subject: */jenkins.sh: set -e after setting clean up trap
......................................................................

*/jenkins.sh: set -e after setting clean up trap

Abort the script and trigger the clean up script, whenever any of the
commands below to prepare the testsuite are failing. This saves time
with figuring out why suddenly all or most tests are failing, and avoids
running the entire testsuite on jenkins if it's obviously not going to
work.

Related: OS#3208
Change-Id: Ie68da2affda8c96b3a515a857a921a05f1bf8ef7
---
M nplab-m3ua-test/jenkins.sh
M nplab-sua-test/jenkins.sh
M osmo-gsm-tester/jenkins.sh
M ttcn3-bsc-test/jenkins-sccplite.sh
M ttcn3-bsc-test/jenkins.sh
M ttcn3-bscnat-test/jenkins.sh
M ttcn3-bts-test/jenkins.sh
M ttcn3-cbc-test/jenkins.sh
M ttcn3-fr-test/jenkins.sh
M ttcn3-gbproxy-test-fr/jenkins.sh
M ttcn3-gbproxy-test/jenkins.sh
M ttcn3-ggsn-test/jenkins.sh
M ttcn3-hlr-test/jenkins.sh
M ttcn3-mgw-test/jenkins.sh
M ttcn3-msc-test/jenkins.sh
M ttcn3-nitb-sysinfo/jenkins.sh
M ttcn3-pcu-test/jenkins-sns.sh
M ttcn3-pcu-test/jenkins.sh
M ttcn3-remsim-test/jenkins.sh
M ttcn3-sccp-test/jenkins.sh
M ttcn3-sgsn-test/jenkins.sh
M ttcn3-sip-test/jenkins.sh
M ttcn3-smlc-test/jenkins.sh
M ttcn3-stp-test/jenkins.sh
24 files changed, 24 insertions(+), 0 deletions(-)

Approvals:
  osmith: Looks good to me, approved; Verified



diff --git a/nplab-m3ua-test/jenkins.sh b/nplab-m3ua-test/jenkins.sh
index cd59c99..1e9a248 100755
--- a/nplab-m3ua-test/jenkins.sh
+++ b/nplab-m3ua-test/jenkins.sh
@@ -10,6 +10,7 @@
 	"nplab-m3ua-test"
 
 set_clean_up_trap
+set -e
 
 mkdir $VOL_BASE_DIR/m3ua-tester
 cp m3ua-param-testtool.scm all-sgp-tests.txt $VOL_BASE_DIR/m3ua-tester/
diff --git a/nplab-sua-test/jenkins.sh b/nplab-sua-test/jenkins.sh
index baf1c9b..eeb0f06 100755
--- a/nplab-sua-test/jenkins.sh
+++ b/nplab-sua-test/jenkins.sh
@@ -10,6 +10,7 @@
 	"nplab-sua-test"
 
 set_clean_up_trap
+set -e
 
 mkdir $VOL_BASE_DIR/sua-tester
 cp sua-param-testtool-sgp.scm some-sua-sgp-tests.txt $VOL_BASE_DIR/sua-tester/
diff --git a/osmo-gsm-tester/jenkins.sh b/osmo-gsm-tester/jenkins.sh
index 4018dc0..ae645e7 100755
--- a/osmo-gsm-tester/jenkins.sh
+++ b/osmo-gsm-tester/jenkins.sh
@@ -59,6 +59,7 @@
 	"osmo-gsm-tester"
 
 set_clean_up_trap
+set -e
 
 SUBNET=50
 network_create $SUBNET
diff --git a/ttcn3-bsc-test/jenkins-sccplite.sh b/ttcn3-bsc-test/jenkins-sccplite.sh
index 9bb49fb..bc6eaa0 100755
--- a/ttcn3-bsc-test/jenkins-sccplite.sh
+++ b/ttcn3-bsc-test/jenkins-sccplite.sh
@@ -8,6 +8,7 @@
 	"ttcn3-bsc-test"
 
 set_clean_up_trap
+set -e
 
 #Make sure NET_NAME doesn't clash with the AoIP BSC test
 NET_NAME=ttcn3-bsc_sccplite-test
diff --git a/ttcn3-bsc-test/jenkins.sh b/ttcn3-bsc-test/jenkins.sh
index 460ab38..18236a2 100755
--- a/ttcn3-bsc-test/jenkins.sh
+++ b/ttcn3-bsc-test/jenkins.sh
@@ -9,6 +9,7 @@
 	"ttcn3-bsc-test"
 
 set_clean_up_trap
+set -e
 
 mkdir $VOL_BASE_DIR/bsc-tester
 cp BSC_Tests.cfg $VOL_BASE_DIR/bsc-tester/
diff --git a/ttcn3-bscnat-test/jenkins.sh b/ttcn3-bscnat-test/jenkins.sh
index e0cd654..1182df0 100755
--- a/ttcn3-bscnat-test/jenkins.sh
+++ b/ttcn3-bscnat-test/jenkins.sh
@@ -7,6 +7,7 @@
 	"ttcn3-bscnat-test"
 
 set_clean_up_trap
+set -e
 
 mkdir $VOL_BASE_DIR/bscnat-tester
 cp BSCNAT_Tests.cfg $VOL_BASE_DIR/bscnat-tester/
diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh
index 610b3c7..5fab160 100755
--- a/ttcn3-bts-test/jenkins.sh
+++ b/ttcn3-bts-test/jenkins.sh
@@ -10,6 +10,7 @@
 	"ttcn3-bts-test"
 
 set_clean_up_trap
+set -e
 
 clean_up() {
 	# append ':hopping' to the classnames,
diff --git a/ttcn3-cbc-test/jenkins.sh b/ttcn3-cbc-test/jenkins.sh
index d8735cf..5c2bf5d 100755
--- a/ttcn3-cbc-test/jenkins.sh
+++ b/ttcn3-cbc-test/jenkins.sh
@@ -7,6 +7,7 @@
 	"ttcn3-cbc-test"
 
 set_clean_up_trap
+set -e
 
 mkdir $VOL_BASE_DIR/cbc-tester
 cp CBC_Tests.cfg $VOL_BASE_DIR/cbc-tester/
diff --git a/ttcn3-fr-test/jenkins.sh b/ttcn3-fr-test/jenkins.sh
index 0baafd7..ee76984 100755
--- a/ttcn3-fr-test/jenkins.sh
+++ b/ttcn3-fr-test/jenkins.sh
@@ -6,6 +6,7 @@
 	"ttcn3-fr-test"
 
 set_clean_up_trap
+set -e
 
 SUBNET=26
 network_create $SUBNET
diff --git a/ttcn3-gbproxy-test-fr/jenkins.sh b/ttcn3-gbproxy-test-fr/jenkins.sh
index 2d1a46f..d1ecb0a 100755
--- a/ttcn3-gbproxy-test-fr/jenkins.sh
+++ b/ttcn3-gbproxy-test-fr/jenkins.sh
@@ -20,6 +20,7 @@
 	"ttcn3-gbproxy-test"
 
 set_clean_up_trap
+set -e
 
 SUBNET=25
 network_create $SUBNET
diff --git a/ttcn3-gbproxy-test/jenkins.sh b/ttcn3-gbproxy-test/jenkins.sh
index b62b757..3595c16 100755
--- a/ttcn3-gbproxy-test/jenkins.sh
+++ b/ttcn3-gbproxy-test/jenkins.sh
@@ -7,6 +7,7 @@
 	"ttcn3-gbproxy-test"
 
 set_clean_up_trap
+set -e
 
 SUBNET=24
 network_create $SUBNET
diff --git a/ttcn3-ggsn-test/jenkins.sh b/ttcn3-ggsn-test/jenkins.sh
index 674eb8d..95cbc2f 100755
--- a/ttcn3-ggsn-test/jenkins.sh
+++ b/ttcn3-ggsn-test/jenkins.sh
@@ -7,6 +7,7 @@
 	"ttcn3-ggsn-test"
 
 set_clean_up_trap
+set -e
 
 mkdir $VOL_BASE_DIR/ggsn-tester
 cp GGSN_Tests.cfg $VOL_BASE_DIR/ggsn-tester/
diff --git a/ttcn3-hlr-test/jenkins.sh b/ttcn3-hlr-test/jenkins.sh
index 4dfb9aa..e003e03 100755
--- a/ttcn3-hlr-test/jenkins.sh
+++ b/ttcn3-hlr-test/jenkins.sh
@@ -7,6 +7,7 @@
 	"ttcn3-hlr-test"
 
 set_clean_up_trap
+set -e
 
 SUBNET=10
 network_create $SUBNET
diff --git a/ttcn3-mgw-test/jenkins.sh b/ttcn3-mgw-test/jenkins.sh
index 87c1798..f9d0133 100755
--- a/ttcn3-mgw-test/jenkins.sh
+++ b/ttcn3-mgw-test/jenkins.sh
@@ -7,6 +7,7 @@
 	"ttcn3-mgw-test"
 
 set_clean_up_trap
+set -e
 
 mkdir $VOL_BASE_DIR/mgw-tester
 cp MGCP_Test.cfg $VOL_BASE_DIR/mgw-tester/
diff --git a/ttcn3-msc-test/jenkins.sh b/ttcn3-msc-test/jenkins.sh
index 373fa7e..dd91e24 100755
--- a/ttcn3-msc-test/jenkins.sh
+++ b/ttcn3-msc-test/jenkins.sh
@@ -8,6 +8,7 @@
 	"ttcn3-msc-test"
 
 set_clean_up_trap
+set -e
 
 SUBNET=20
 network_create $SUBNET
diff --git a/ttcn3-nitb-sysinfo/jenkins.sh b/ttcn3-nitb-sysinfo/jenkins.sh
index d0ef972..e2cc494 100755
--- a/ttcn3-nitb-sysinfo/jenkins.sh
+++ b/ttcn3-nitb-sysinfo/jenkins.sh
@@ -3,6 +3,7 @@
 . ../jenkins-common.sh
 
 set_clean_up_trap
+set -e
 
 clean_up() {
 	# start some stupid helper container so we can access the volume
diff --git a/ttcn3-pcu-test/jenkins-sns.sh b/ttcn3-pcu-test/jenkins-sns.sh
index f9e96ed..aaed27a 100755
--- a/ttcn3-pcu-test/jenkins-sns.sh
+++ b/ttcn3-pcu-test/jenkins-sns.sh
@@ -7,6 +7,7 @@
 	"ttcn3-pcu-test"
 
 set_clean_up_trap
+set -e
 
 SUBNET=14
 network_create $SUBNET
diff --git a/ttcn3-pcu-test/jenkins.sh b/ttcn3-pcu-test/jenkins.sh
index 539b956..11c77ad 100755
--- a/ttcn3-pcu-test/jenkins.sh
+++ b/ttcn3-pcu-test/jenkins.sh
@@ -7,6 +7,7 @@
 	"ttcn3-pcu-test"
 
 set_clean_up_trap
+set -e
 
 SUBNET=13
 network_create $SUBNET
diff --git a/ttcn3-remsim-test/jenkins.sh b/ttcn3-remsim-test/jenkins.sh
index 9a62581..ae013d6 100755
--- a/ttcn3-remsim-test/jenkins.sh
+++ b/ttcn3-remsim-test/jenkins.sh
@@ -7,6 +7,7 @@
 	"ttcn3-remsim-test"
 
 set_clean_up_trap
+set -e
 
 start_server() {
 	echo Starting container with osmo-remsim-server
diff --git a/ttcn3-sccp-test/jenkins.sh b/ttcn3-sccp-test/jenkins.sh
index c73e7c7..40ff1f1 100755
--- a/ttcn3-sccp-test/jenkins.sh
+++ b/ttcn3-sccp-test/jenkins.sh
@@ -8,6 +8,7 @@
 	"ttcn3-sccp-test"
 
 set_clean_up_trap
+set -e
 
 mkdir $VOL_BASE_DIR/sccp-tester
 cp SCCP_Tests.cfg $VOL_BASE_DIR/sccp-tester/
diff --git a/ttcn3-sgsn-test/jenkins.sh b/ttcn3-sgsn-test/jenkins.sh
index 1cbc855..df500af 100755
--- a/ttcn3-sgsn-test/jenkins.sh
+++ b/ttcn3-sgsn-test/jenkins.sh
@@ -8,6 +8,7 @@
 	"ttcn3-sgsn-test"
 
 set_clean_up_trap
+set -e
 
 SUBNET=8
 network_create $SUBNET
diff --git a/ttcn3-sip-test/jenkins.sh b/ttcn3-sip-test/jenkins.sh
index de9b87c..ffec3d2 100755
--- a/ttcn3-sip-test/jenkins.sh
+++ b/ttcn3-sip-test/jenkins.sh
@@ -7,6 +7,7 @@
 	"ttcn3-sip-test"
 
 set_clean_up_trap
+set -e
 
 SUBNET=11
 network_create $SUBNET
diff --git a/ttcn3-smlc-test/jenkins.sh b/ttcn3-smlc-test/jenkins.sh
index 9e7f66c..f16536f 100755
--- a/ttcn3-smlc-test/jenkins.sh
+++ b/ttcn3-smlc-test/jenkins.sh
@@ -8,6 +8,7 @@
 	"ttcn3-smlc-test"
 
 set_clean_up_trap
+set -e
 
 mkdir $VOL_BASE_DIR/smlc-tester
 cp SMLC_Tests.cfg $VOL_BASE_DIR/smlc-tester/
diff --git a/ttcn3-stp-test/jenkins.sh b/ttcn3-stp-test/jenkins.sh
index b15ae4b..db2ffdd 100755
--- a/ttcn3-stp-test/jenkins.sh
+++ b/ttcn3-stp-test/jenkins.sh
@@ -7,6 +7,7 @@
 	"ttcn3-stp-test"
 
 set_clean_up_trap
+set -e
 
 mkdir $VOL_BASE_DIR/stp-tester
 cp STP_Tests.cfg $VOL_BASE_DIR/stp-tester/

-- 
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23002
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: Ie68da2affda8c96b3a515a857a921a05f1bf8ef7
Gerrit-Change-Number: 23002
Gerrit-PatchSet: 4
Gerrit-Owner: osmith <osmith at sysmocom.de>
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: osmith <osmith at sysmocom.de>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210226/f3246bd6/attachment.htm>


More information about the gerrit-log mailing list