diff options
| author | Oliver Smith <osmith@sysmocom.de> | 2020-03-18 15:37:59 +0100 |
|---|---|---|
| committer | osmith <osmith@sysmocom.de> | 2020-05-06 06:22:12 +0000 |
| commit | f48c09d3bc528d3531be72bf472a204a8fa6e3f4 (patch) | |
| tree | ee2f58beeecb312f6e67ef5fa82737f04ad12d4c /ttcn3-pcu-test | |
| parent | 27ab2a5d52a37621bce4d8c3cdab759036ff2124 (diff) | |
ttcn3-*-test/jenkins*.sh: add $DOCKER_ARGS
Allow to pass options to each "docker run" line in the various
jenkins.sh scripts. I'm using this to run the testsuites and Osmocom
components in docker with the same configurations as jenkins, but with
Osmocom and testsuite binaries built outside and mounted into the
containers:
DOCKER_ARGS="-v /usr/local:/usr/local:ro -v $hacks:/osmo-ttcn3-hacks:ro"
This allows very short test cycles without a second set of configs. The
full script that makes use of this feature is in osmo-dev.git,
ttcn3/ttcn3.sh.
Change-Id: I8d1f78aee926f8f6ec0b704e16639bc83f525816
Diffstat (limited to 'ttcn3-pcu-test')
| -rwxr-xr-x | ttcn3-pcu-test/jenkins-sns.sh | 2 | ||||
| -rwxr-xr-x | ttcn3-pcu-test/jenkins.sh | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/ttcn3-pcu-test/jenkins-sns.sh b/ttcn3-pcu-test/jenkins-sns.sh index 51b5f64..06403d3 100755 --- a/ttcn3-pcu-test/jenkins-sns.sh +++ b/ttcn3-pcu-test/jenkins-sns.sh @@ -26,6 +26,7 @@ docker run --rm \ -v $VOL_BASE_DIR/pcu:/data \ -v $VOL_BASE_DIR/unix:/data/unix \ --name ${BUILD_TAG}-pcu-sns -d \ + $DOCKER_ARGS \ $REPO_USER/osmo-pcu-$IMAGE_SUFFIX \ /bin/sh -c "/usr/local/bin/respawn.sh osmo-pcu -c /data/osmo-pcu.cfg -i 172.18.14.10 >>/data/osmo-pcu.log 2>&1" @@ -36,6 +37,7 @@ docker run --rm \ -v $VOL_BASE_DIR/pcu-tester:/data \ -v $VOL_BASE_DIR/unix:/data/unix \ --name ${BUILD_TAG}-ttcn3-pcu-test-sns \ + $DOCKER_ARGS \ $REPO_USER/ttcn3-pcu-test echo Stopping containers diff --git a/ttcn3-pcu-test/jenkins.sh b/ttcn3-pcu-test/jenkins.sh index e0f1212..271f89f 100755 --- a/ttcn3-pcu-test/jenkins.sh +++ b/ttcn3-pcu-test/jenkins.sh @@ -26,6 +26,7 @@ docker run --rm \ -v $VOL_BASE_DIR/pcu:/data \ -v $VOL_BASE_DIR/unix:/data/unix \ --name ${BUILD_TAG}-pcu -d \ + $DOCKER_ARGS \ $REPO_USER/osmo-pcu-$IMAGE_SUFFIX \ /bin/sh -c "/usr/local/bin/respawn.sh osmo-pcu -c /data/osmo-pcu.cfg -i 172.18.13.10 >>/data/osmo-pcu.log 2>&1" @@ -36,6 +37,7 @@ docker run --rm \ -v $VOL_BASE_DIR/pcu-tester:/data \ -v $VOL_BASE_DIR/unix:/data/unix \ --name ${BUILD_TAG}-ttcn3-pcu-test \ + $DOCKER_ARGS \ $REPO_USER/ttcn3-pcu-test echo Stopping containers |