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

osmo-gsm-tester: Pass conf dir through -c cmd line arg instead of env var 

As of osmo-gsm-tester.git Change-Id
I7eb69f870d0dcb5906d45ae067d6bed1aabf5862, the enviornment variable
OSMO_GSM_TESTER_CONF is deprecated in favour of already existing -c cmd
line argument. Let's use it while still providing the docker setup with
a way (using same env var name) to modify where the conf dir is to be
found inside the docker container (for instance, to provide an external
conf dir).

Change-Id: I54ea9dc4d0bb205debf312f5a37053bc60cfcdb7
changes/04/18104/1
Pau Espin 2020-05-07 18:47:21 +02:00
parent f48c09d3bc
commit cfad27be56
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osmo-gsm-tester/Dockerfile
View File

@ -132,8 +132,6 @@ RUN mkdir -p /etc/security/limits.d/ && cp osmo-gsm-tester/utils/limits.d/*
VOLUME /data
COPY resources.conf /tmp/osmo-gsm-tester/sysmocom/resources.conf
ENV OSMO_GSM_TESTER_CONF /tmp/osmo-gsm-tester/sysmocom
WORKDIR /data
CMD ["/bin/sh", "-c", "/data/osmo-gsm-tester-master.sh >/data/osmo-gsm-tester.log 2>&1"]

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

@ -80,6 +80,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_CONF=${OSMO_GSM_TESTER_CONF:-/tmp/osmo-gsm-tester/sysmocom}
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 \
@ -90,6 +91,7 @@ docker run --rm \
--ip 172.18.50.2 \
-v $VOL_BASE_DIR/ogt-master:/data \
-v "${TRIAL_DIR}:/tmp/trial" \
-e "OSMO_GSM_TESTER_CONF=${OSMO_GSM_TESTER_CONF}" \
-e "OSMO_GSM_TESTER_OPTS=${OSMO_GSM_TESTER_OPTS}" \
-e "SRS_LTE_REPO_NAME=${SRS_LTE_REPO_NAME}" \
-e "HOST_USER_ID=$(id -u)" \

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

@ -43,7 +43,7 @@ fi
chown -R jenkins /tmp/trial/
rc=0
su -c "python3 -u /tmp/osmo-gsm-tester/src/osmo-gsm-tester.py /tmp/trial $OSMO_GSM_TESTER_OPTS" -m jenkins || rc=$?
su -c "python3 -u /tmp/osmo-gsm-tester/src/osmo-gsm-tester.py -c \"$OSMO_GSM_TESTER_CONF\" /tmp/trial $OSMO_GSM_TESTER_OPTS" -m jenkins || rc=$?
# Make trial dir again owned by user running the container:
chown -R "${HOST_USER_ID}:${HOST_GROUP_ID}" /tmp/trial/