Change in docker-playground[master]: docker_images_require: build depends too

[osmith]

osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/18602 )

Change subject: docker_images_require: build depends too
......................................................................

docker_images_require: build depends too

Add a function to automatically resolve the most common dependencies,
osmo-* need debian-stretch-build and ttcn3-* need debian-stretch-titan.
Do this in a shell function in jenkins-common.sh, so we can extend it in
the next patch with distribution specific dependencies (osmo-*-centos8
needs centos8-build).

Related: OS#4564
Change-Id: I98760c6dc3206529c0e267338c9f6f8e1d5be33a
---
M jenkins-common.sh
1 file changed, 14 insertions(+), 0 deletions(-)

Approvals:
  laforge: Looks good to me, approved
  fixeria: Looks good to me, but someone else must approve
  osmith: Verified



diff --git a/jenkins-common.sh b/jenkins-common.sh
index 01f23d0..ea03d52 100644
--- a/jenkins-common.sh
+++ b/jenkins-common.sh
@@ -2,12 +2,26 @@
 	test -n "$(docker images -q "$REPO_USER/$1")"
 }
 
+docker_depends() {
+	case "$1" in
+	osmo-*) echo "debian-stretch-build" ;;
+	ttcn3-*) echo "debian-stretch-titan" ;;
+	esac
+}
+
 docker_images_require() {
 	local i
 	local from_line
 	local pull_arg
+	local depends
 
 	for i in $@; do
+		# Build dependencies first
+		depends="$(docker_depends "$i")"
+		if [ -n "$depends" ]; then
+			docker_images_require $depends
+		fi
+
 		# Trigger image build (cache will be used when up-to-date)
 		if [ -z "$NO_DOCKER_IMAGE_BUILD" ]; then
 			# Pull upstream base images

-- 
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/18602
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I98760c6dc3206529c0e267338c9f6f8e1d5be33a
Gerrit-Change-Number: 18602
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith at sysmocom.de>
Gerrit-Reviewer: fixeria <axilirator at gmail.com>
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: osmith <osmith at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200530/ad97cb8f/attachment.htm>