Change in docker-playground[master]: osmo-gsm-tester: Allow passing osmo-gsm-tester params from jenkins.sh...

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/.

pespin gerrit-no-reply at lists.osmocom.org
Wed Mar 11 15:35:58 UTC 2020


pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/17463 )


Change subject: osmo-gsm-tester: Allow passing osmo-gsm-tester params from jenkins.sh caller
......................................................................

osmo-gsm-tester: Allow passing osmo-gsm-tester params from jenkins.sh caller

After this patch, one can run osmo-gsm-tester with specific parameters
(debug level, suite and tests to run, etc.) by using
OSMO_GSM_TESTER_OPTS variable:
OSMO_GSM_TESTER_OPTS="-s 4g -t ping -l error" ./jenkins.sh

Change-Id: I2e8ff51a3152125148c6a117a987e8c11a576e1e
---
M osmo-gsm-tester/jenkins.sh
M osmo-gsm-tester/osmo-gsm-tester-master.sh
2 files changed, 10 insertions(+), 6 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/63/17463/1

diff --git a/osmo-gsm-tester/jenkins.sh b/osmo-gsm-tester/jenkins.sh
index 71a2ee3..c114222 100755
--- a/osmo-gsm-tester/jenkins.sh
+++ b/osmo-gsm-tester/jenkins.sh
@@ -7,10 +7,12 @@
 # Trial directory must be set in the parent host's /tmp/trial path, which will
 # then be mounted to ogt-master and used my osmo-gsm-tester.
 #
-# osmo-gsm-tester parameters and suites are passed in osmo-gsm-tester.sh in same
-# directory as this script.
+# osmo-gsm-tester parameters and suites are passed to osmo-gsm-tester.sh in same
+# directory as this script using environment variable OSMO_GSM_TESTER_OPTS.
 #
-# Log files can be found in host's /tmp/logs/ directory.
+# Log files can be found in host's /tmp/logs/ directory. Results generated by
+# osmo-gsm-tester last run can be found as usual under the trial directory
+# (/tmp/trial/last_run).
 
 . ../jenkins-common.sh
 IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"
@@ -40,6 +42,7 @@
 		/bin/sh -c "/data/osmo-gsm-tester-slave.sh >/data/sshd.log 2>&1"
 
 echo Starting container with osmo-gsm-tester main unit
+OSMO_GSM_TESTER_OPTS=${OSMO_GSM_TESTER_OPTS:--T -l dbg -s 4g:srsenb-rftype at zmq+srsue-rftype@zmq -t ping}
 docker run	--rm \
 		--cap-add=NET_ADMIN \
 		--cap-add=SYS_ADMIN \
@@ -49,6 +52,7 @@
 		--ip 172.18.50.2 \
 		-v $VOL_BASE_DIR/ogt-master:/data \
 		-v /tmp/trial:/tmp/trial \
+		-e "OSMO_GSM_TESTER_OPTS=${OSMO_GSM_TESTER_OPTS}" \
 		--name ${BUILD_TAG}-ogt-master \
 		$REPO_USER/osmo-gsm-tester
 
diff --git a/osmo-gsm-tester/osmo-gsm-tester-master.sh b/osmo-gsm-tester/osmo-gsm-tester-master.sh
index bfd303b..975e4e5 100755
--- a/osmo-gsm-tester/osmo-gsm-tester-master.sh
+++ b/osmo-gsm-tester/osmo-gsm-tester-master.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
-
+set -x -e
 # Add local IP addresses required by osmo-gsm-tester resources:
-ip addr add 172.18.50.2/24 dev eth0
+ip addr add 172.18.50.2/24 dev eth0 || true #already set by docker run --ip cmd
 ip addr add 172.18.50.3/24 dev eth0
 ip addr add 172.18.50.4/24 dev eth0
 ip addr add 172.18.50.5/24 dev eth0
@@ -11,4 +11,4 @@
 ip addr add 172.18.50.9/24 dev eth0
 ip addr add 172.18.50.10/24 dev eth0
 
-su -c "python3 -u /tmp/osmo-gsm-tester/src/osmo-gsm-tester.py /tmp/trial -T -l dbg -s 4g -t iperf3" -m jenkins
+su -c "python3 -u /tmp/osmo-gsm-tester/src/osmo-gsm-tester.py /tmp/trial $OSMO_GSM_TESTER_OPTS" -m jenkins

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

Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I2e8ff51a3152125148c6a117a987e8c11a576e1e
Gerrit-Change-Number: 17463
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200311/b3f7674f/attachment.htm>


More information about the gerrit-log mailing list