<p>osmith has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/docker-playground/+/18602">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">docker_images_require: build depends too<br><br>Add a function to automatically resolve the most common dependencies,<br>osmo-* need debian-stretch-build and ttcn3-* need debian-stretch-titan.<br>Do this in a shell function in jenkins-common.sh, so we can extend it in<br>the next patch with distribution specific dependencies (osmo-*-centos8<br>needs centos8-build).<br><br>Related: OS#4564<br>Change-Id: I98760c6dc3206529c0e267338c9f6f8e1d5be33a<br>---<br>M jenkins-common.sh<br>1 file changed, 14 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/02/18602/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/jenkins-common.sh b/jenkins-common.sh</span><br><span>index 01f23d0..ea03d52 100644</span><br><span>--- a/jenkins-common.sh</span><br><span>+++ b/jenkins-common.sh</span><br><span>@@ -2,12 +2,26 @@</span><br><span>   test -n "$(docker images -q "$REPO_USER/$1")"</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+docker_depends() {</span><br><span style="color: hsl(120, 100%, 40%);">+        case "$1" in</span><br><span style="color: hsl(120, 100%, 40%);">+        osmo-*) echo "debian-stretch-build" ;;</span><br><span style="color: hsl(120, 100%, 40%);">+      ttcn3-*) echo "debian-stretch-titan" ;;</span><br><span style="color: hsl(120, 100%, 40%);">+     esac</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> docker_images_require() {</span><br><span>       local i</span><br><span>      local from_line</span><br><span>      local pull_arg</span><br><span style="color: hsl(120, 100%, 40%);">+        local depends</span><br><span> </span><br><span>    for i in $@; do</span><br><span style="color: hsl(120, 100%, 40%);">+               # Build dependencies first</span><br><span style="color: hsl(120, 100%, 40%);">+            depends="$(docker_depends "$i")"</span><br><span style="color: hsl(120, 100%, 40%);">+          if [ -n "$depends" ]; then</span><br><span style="color: hsl(120, 100%, 40%);">+                  docker_images_require $depends</span><br><span style="color: hsl(120, 100%, 40%);">+                fi</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>                 # Trigger image build (cache will be used when up-to-date)</span><br><span>           if [ -z "$NO_DOCKER_IMAGE_BUILD" ]; then</span><br><span>                   # Pull upstream base images</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/docker-playground/+/18602">change 18602</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/docker-playground/+/18602"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: docker-playground </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I98760c6dc3206529c0e267338c9f6f8e1d5be33a </div>
<div style="display:none"> Gerrit-Change-Number: 18602 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>