osmocom
/
docker-playground
mirror of https://gerrit.osmocom.org/docker-playground
10
0
Fork 0
Code Releases Activity

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
This commit is contained in:
Pau Espin 2020-03-11 16:33:59 +01:00 committed by pespin
parent d61b741a61
commit 9145a91594
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
osmo-gsm-tester/jenkins.sh
View File

@ -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 @@ docker run --rm \
/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@zmq+srsue-rftype@zmq -t ping}
docker run --rm \
--cap-add=NET_ADMIN \
--cap-add=SYS_ADMIN \
@ -49,6 +52,7 @@ docker run --rm \
--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

6
osmo-gsm-tester/osmo-gsm-tester-master.sh
View File

@ -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.8/24 dev eth0
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