summaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorOliver Smith <osmith@sysmocom.de>2020-01-08 14:22:08 +0100
committerOliver Smith <osmith@sysmocom.de>2020-01-15 10:24:38 +0100
commitb79e06367bf72646c5114d60766ee61f1b9631bb (patch)
treed07a72c508dbe683faa766fcecb08e79214095b4 /contrib
parentd0418d0f92b2cf73932c068f50bb55f90b78137b (diff)
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
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/jenkins.sh3
1 files changed, 1 insertions, 2 deletions
diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh
index b161230..275fc69 100755
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -11,6 +11,5 @@ git rev-parse HEAD
git status
if [ `uname` = "Linux" ]; then
- cd docker
- ./rebuild_osmocom_jenkins_image.sh
+ scripts/osmo-ci-docker-rebuild.sh
fi