docker: move to docker-playground.git

Instead of building "osmocom:deb9_amd64" from this repository, build
"$USER/debian-stretch-jenkins" from docker-playground.git (same
Dockerfile). Adjust all jobs to use the new image name.

Add a new "update-osmo-ci-on-slaves-dp" jenkins job, which triggers
the existing "update-osmo-ci-on-slaves" job whenever
docker-playground.git changes.

Replace docker/rebuild_osmocom_jenkins_image.sh with
scripts/osmo-ci-docker-rebuild.sh, so we can get rid of the docker dir.
I thought about dropping the script completely, and directly writing the
two lines into contrib/jenkins.sh. But I kept the extra script for
convenience, when testing locally.

Related: OS#4345
Depends: docker-playground I125ae8a6bcabbd1f485028c79b0abacda0622c3a
Change-Id: I30a61aebcadef5536e74edd35e1c75ef77a2da9f

4 files changed, 28 insertions, 3 deletions

diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml
index dfc9b88..0c338a6 100644
--- a/jobs/gerrit-verifications.yml
+++ b/jobs/gerrit-verifications.yml
@@ -40,7 +40,7 @@
               -w /build -i -u build \
               -v "$PWD:/build" -v "$HOME/bin:/build_bin" \
               -v "$ARTIFACT_STORE:/artifact_store" \
-    docker_img: 'osmocom:deb9_amd64'
+    docker_img: '$USER/debian-stretch-jenkins'
     cmd: '{docker_run} {docker_img} /build/contrib/jenkins.sh'
     gerrit_url: 'ssh://jenkins@gerrit.osmocom.org:29418'
     repos_url: '{gerrit_url}/{repos}'
diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml
index 55626ea..78aeb7c 100644
--- a/jobs/master-builds.yml
+++ b/jobs/master-builds.yml
@@ -41,7 +41,7 @@
               -v "$PWD:/build" -v "$HOME/bin:/build_bin" \
               -v "$ARTIFACT_STORE:/artifact_store" \
               -v "$HOME/.ssh:/home/build/.ssh:ro" \
-    docker_img: 'osmocom:deb9_amd64'
+    docker_img: '$USER/debian-stretch-jenkins'
     cmd: '{docker_run} {docker_img} /build/contrib/jenkins.sh'
     wrappers: []
     trigger:
diff --git a/jobs/osmo-gsm-tester-runner.yml b/jobs/osmo-gsm-tester-runner.yml
index c9d84a3..a4b64fd 100644
--- a/jobs/osmo-gsm-tester-runner.yml
+++ b/jobs/osmo-gsm-tester-runner.yml
@@ -241,7 +241,8 @@
               -v "$HOME/bin:/build_bin" \
               -v "$HOME/.ssh:/home/build/.ssh:ro" \
               --cap-add=sys_nice \
-              osmocom:deb9_amd64 /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'
+              $USER/debian-stretch-jenkins \
+              /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:
           artifacts: '*-run.tgz, *-bin.tgz'
diff --git a/jobs/update-osmo-ci-on-slaves.yml b/jobs/update-osmo-ci-on-slaves.yml
index 2c7309e..d47f08e 100644
--- a/jobs/update-osmo-ci-on-slaves.yml
+++ b/jobs/update-osmo-ci-on-slaves.yml
@@ -39,4 +39,28 @@
       - email:
           recipients: intern@lists.sysmocom.de
 
+# Trigger from docker-playground.git too
+- job:
+    name: update-osmo-ci-on-slaves-dp
+    description: |
+      Trigger <a href="https://jenkins.osmocom.org/jenkins/job/update-osmo-ci-on-slaves/">update-osmo-ci-on-slaves</a>
+      on changes in docker-playground.git, so it can rebuild docker containers relevant for the jenkins slaves.
+    node: osmocom-master-debian9
+    scm:
+      - git:
+          url: git://git.osmocom.org/docker-playground
+          git-config-name: 'Jenkins Builder'
+          git-config-email: 'jenkins@osmocom.org'
+          skip-tag: true
+          branches:
+            - 'origin/master'
+    triggers:
+      - pollscm:
+          cron: "H/5 * * * *"
+          ignore-post-commit-hooks: false
+    publishers:
+      - trigger:
+          project: "update-osmo-ci-on-slaves"
+
+
 # vim: expandtab tabstop=2 shiftwidth=2