From b79e06367bf72646c5114d60766ee61f1b9631bb Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Wed, 8 Jan 2020 14:22:08 +0100 Subject: 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 --- scripts/osmo-ci-docker-rebuild.sh | 5 +++++ 1 file changed, 5 insertions(+) create mode 100755 scripts/osmo-ci-docker-rebuild.sh (limited to 'scripts') diff --git a/scripts/osmo-ci-docker-rebuild.sh b/scripts/osmo-ci-docker-rebuild.sh new file mode 100755 index 0000000..4a7ee25 --- /dev/null +++ b/scripts/osmo-ci-docker-rebuild.sh @@ -0,0 +1,5 @@ +#!/bin/sh +cd "$(dirname "$0")/.." +. scripts/common.sh +docker_images_require \ + "debian-stretch-jenkins" -- cgit v1.2.3