aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOliver Smith <osmith@sysmocom.de>2021-02-19 15:18:17 +0100
committerOliver Smith <osmith@sysmocom.de>2021-02-26 09:32:34 +0100
commit033c6ab1be7e5ab5883927465cd5313551df5bab (patch)
treeaeda3aa5bd21afc671ae7e3d5711c5bc899e2f92
parent12b961942af0c6761573d0632ca0e16339fb33c3 (diff)
*/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
-rwxr-xr-xnplab-m3ua-test/jenkins.sh1
-rwxr-xr-xnplab-sua-test/jenkins.sh1
-rwxr-xr-xosmo-gsm-tester/jenkins.sh1
-rwxr-xr-xttcn3-bsc-test/jenkins-sccplite.sh1
-rwxr-xr-xttcn3-bsc-test/jenkins.sh1
-rwxr-xr-xttcn3-bscnat-test/jenkins.sh1
-rwxr-xr-xttcn3-bts-test/jenkins.sh1
-rwxr-xr-xttcn3-cbc-test/jenkins.sh1
-rwxr-xr-xttcn3-fr-test/jenkins.sh1
-rwxr-xr-xttcn3-gbproxy-test-fr/jenkins.sh1
-rwxr-xr-xttcn3-gbproxy-test/jenkins.sh1
-rwxr-xr-xttcn3-ggsn-test/jenkins.sh1
-rwxr-xr-xttcn3-hlr-test/jenkins.sh1
-rwxr-xr-xttcn3-mgw-test/jenkins.sh1
-rwxr-xr-xttcn3-msc-test/jenkins.sh1
-rwxr-xr-xttcn3-nitb-sysinfo/jenkins.sh1
-rwxr-xr-xttcn3-pcu-test/jenkins-sns.sh1
-rwxr-xr-xttcn3-pcu-test/jenkins.sh1
-rwxr-xr-xttcn3-remsim-test/jenkins.sh1
-rwxr-xr-xttcn3-sccp-test/jenkins.sh1
-rwxr-xr-xttcn3-sgsn-test/jenkins.sh1
-rwxr-xr-xttcn3-sip-test/jenkins.sh1
-rwxr-xr-xttcn3-smlc-test/jenkins.sh1
-rwxr-xr-xttcn3-stp-test/jenkins.sh1
24 files changed, 24 insertions, 0 deletions
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 @@ docker_images_require \
"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 @@ docker_images_require \
"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 @@ docker_images_require \
"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 @@ docker_images_require \
"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 @@ docker_images_require \
"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 @@ docker_images_require \
"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 @@ docker_images_require \
"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 @@ docker_images_require \
"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 @@ docker_images_require \
"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 @@ docker_images_require \
"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 @@ docker_images_require \
"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 @@ docker_images_require \
"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 @@ docker_images_require \
"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 @@ docker_images_require \
"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 @@ docker_images_require \
"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 @@ docker_images_require \
"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 @@ docker_images_require \
"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 @@ docker_images_require \
"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 @@ docker_images_require \
"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 @@ docker_images_require \
"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 @@ docker_images_require \
"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 @@ docker_images_require \
"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 @@ docker_images_require \
"ttcn3-stp-test"
set_clean_up_trap
+set -e
mkdir $VOL_BASE_DIR/stp-tester
cp STP_Tests.cfg $VOL_BASE_DIR/stp-tester/