summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPau Espin Pedrol <pespin@sysmocom.de>2020-03-12 16:05:21 +0100
committerPau Espin Pedrol <pespin@sysmocom.de>2020-03-12 16:06:05 +0100
commit3e0d3e36c0da0e1b9da35130d590572d0412ba75 (patch)
tree7d0272e970a72470d3fc9450caaa8eca042ecee3
parent23150e1d1516b7761891dbf66c86534ccd60ea65 (diff)
ansible: Use osmo-gsm-tester docker image in jenkins job osmo-gsm-tester_virtual
Let's use the osmo-gsm-tester docker image based on the debian-stretch-jenkins instead of the later directly, since the former has all osmo-gsm-tester required dependencies. Change-Id: I256eeed82eef0969d93dc015e043b0417f56f52c
-rw-r--r--jobs/osmo-gsm-tester-runner.yml2
-rwxr-xr-xscripts/osmo-ci-docker-rebuild.sh3
2 files changed, 3 insertions, 2 deletions
diff --git a/jobs/osmo-gsm-tester-runner.yml b/jobs/osmo-gsm-tester-runner.yml
index 4a47c8e..d00ecfa 100644
--- a/jobs/osmo-gsm-tester-runner.yml
+++ b/jobs/osmo-gsm-tester-runner.yml
@@ -244,7 +244,7 @@
-v "$HOME/bin:/build_bin" \
-v "$HOME/.ssh:/home/build/.ssh:ro" \
--cap-add=sys_nice \
- $USER/debian-stretch-jenkins \
+ $USER/osmo-gsm-tester \
/bin/bash -c 'LANG="en_US.utf8" LC_ALL="en_US.UTF-8" LC_LANG="en_US.UTF-8" PATH="$PWD/osmo-gsm-tester/src:${PATH}" ./osmo-gsm-tester/contrib/jenkins-run.sh'
publishers:
- archive:
diff --git a/scripts/osmo-ci-docker-rebuild.sh b/scripts/osmo-ci-docker-rebuild.sh
index 6a1cc27..58642ff 100755
--- a/scripts/osmo-ci-docker-rebuild.sh
+++ b/scripts/osmo-ci-docker-rebuild.sh
@@ -4,4 +4,5 @@ cd "$(dirname "$0")/.."
. scripts/common.sh
docker_images_require \
"debian-stretch-jenkins" \
- "debian-buster-erlang"
+ "debian-buster-erlang" \
+ "osmo-gsm-tester"