summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPau Espin Pedrol <pespin@sysmocom.de>2020-05-11 18:50:08 +0200
committerPau Espin Pedrol <pespin@sysmocom.de>2020-05-11 18:50:11 +0200
commit71cc851e35d3260a5d08083053f01f2e037c5d04 (patch)
tree82a16fb7a3f0512cf3fe09e572dca219ac68d27a
parent03b6049534399f8d6931d8515a1ada823ba15635 (diff)
osmo-gsm-tester: Point config parameter to file instead of its dirname
Since osmo-gsm-tester.git Change-Id Ieca65b71b543c44cfcec8e83efd0fe053c432e55, the -c parameter holds the config file and not the directory where it is contained. Change-Id: I9aca57c4dd3180367eb17ec92177b90a9c411a6a
-rw-r--r--jobs/osmo-gsm-tester-runner.yml2
-rw-r--r--jobs/osmo-gsm-tester_ttcn3.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/jobs/osmo-gsm-tester-runner.yml b/jobs/osmo-gsm-tester-runner.yml
index 788f057..041ef93 100644
--- a/jobs/osmo-gsm-tester-runner.yml
+++ b/jobs/osmo-gsm-tester-runner.yml
@@ -236,7 +236,7 @@
docker run --rm=true \
-e HOME=/build \
-e JOB_NAME="$JOB_NAME" \
- -e OSMO_GSM_TESTER_CONF="/build/osmo-gsm-tester/sysmocom" \
+ -e OSMO_GSM_TESTER_CONF="/build/osmo-gsm-tester/sysmocom/main.conf" \
-e OSMO_GSM_TESTER_OPTS="$OSMO_GSM_TESTER_OPTS" \
-e BUILD_NUMBER="$BUILD_NUMBER" \
-w /build -i \
diff --git a/jobs/osmo-gsm-tester_ttcn3.sh b/jobs/osmo-gsm-tester_ttcn3.sh
index cb973fd..c844d22 100644
--- a/jobs/osmo-gsm-tester_ttcn3.sh
+++ b/jobs/osmo-gsm-tester_ttcn3.sh
@@ -2,7 +2,7 @@
set -e -x
# On our hardware, we actually use the ttcn3 configuration as-is.
-export OSMO_GSM_TESTER_CONF="$PWD/osmo-gsm-tester/sysmocom/ttcn3"
+export OSMO_GSM_TESTER_CONF="$PWD/osmo-gsm-tester/sysmocom/ttcn3/main.conf"
# debug: provoke a failure
#export OSMO_GSM_TESTER_OPTS="-s debug -t fail"