diff --git a/jobs/osmo-gsm-tester-runner.yml b/jobs/osmo-gsm-tester-runner.yml index bff2a9b4..814c0c92 100644 --- a/jobs/osmo-gsm-tester-runner.yml +++ b/jobs/osmo-gsm-tester-runner.yml @@ -224,6 +224,16 @@ - copy_artifact: repo: osmo-gsm-tester_build-osmocom-bb - shell: | + # Build the docker image + rm -rf docker-playground + git clone \ + --depth=1 \ + --branch="$DOCKER_PLAYGROUND_BRANCH" \ + https://gerrit.osmocom.org/docker-playground \ + docker-playground + git -C docker-playground log --oneline + make -C docker-playground/osmo-gsm-tester + unlink osmo-gsm-tester/sysmocom/resources.conf || true ln -s resources.conf.virtual osmo-gsm-tester/sysmocom/resources.conf @@ -260,3 +270,7 @@ name: "OSMO_GSM_TESTER_BRANCH" default: "master" description: "Which branch/sha should be used for testing" + - string: + name: "DOCKER_PLAYGROUND_BRANCH" + default: "master" + description: "Which branch/sha should be used for building the osmo-gsm-tester docker container" diff --git a/scripts/osmo-ci-docker-rebuild.sh b/scripts/osmo-ci-docker-rebuild.sh index 9c2aae62..f409d455 100755 --- a/scripts/osmo-ci-docker-rebuild.sh +++ b/scripts/osmo-ci-docker-rebuild.sh @@ -10,8 +10,3 @@ if [ "$(arch)" = "x86_64" ]; then "debian-bullseye-erlang" \ "debian-bullseye-jenkins" fi - -if [ -d "/var/tmp/osmo-gsm-tester/state" ]; then - docker_images_require \ - "osmo-gsm-tester" -fi