<p>osmith has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/docker-playground/+/18553">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">jenkins-common.sh: add DISTRO environment variable<br><br>Set DISTRO and DOCKER_TAG, based on the DISTRO environment variable.<br>Defaults are debian-stretch and latest, and if DISTRO is centos8,<br>DOCKER_TAG is also changed to centos8 to avoid collisions.<br><br>Related: OS#4564<br>Change-Id: I598a262fe1a7ed4dd89e13c53e4ded103c6e3b91<br>---<br>M jenkins-common.sh<br>1 file changed, 31 insertions(+), 4 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/53/18553/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 9fd3857..a34e115 100644</span><br><span>--- a/jenkins-common.sh</span><br><span>+++ b/jenkins-common.sh</span><br><span>@@ -1,7 +1,23 @@</span><br><span style="color: hsl(120, 100%, 40%);">+# Environment variables:</span><br><span style="color: hsl(120, 100%, 40%);">+# * DISTRO: linux distribution name (e.g. "debian-stretch", "centos8"). Defaults to "debian-stretch". This is passed as</span><br><span style="color: hsl(120, 100%, 40%);">+# argument to the Dockerfiles. Also a DOCKER_TAG is set ("latest" for "debian-stretch", otherwise the</span><br><span style="color: hsl(120, 100%, 40%);">+# distribution name), so images built for two different distributions don't both get tagged as "latest".</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> docker_image_exists() {</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_get_tag() {</span><br><span style="color: hsl(120, 100%, 40%);">+ case "$DISTRO" in</span><br><span style="color: hsl(120, 100%, 40%);">+ debian-stretch)</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "latest"</span><br><span style="color: hsl(120, 100%, 40%);">+ ;;</span><br><span style="color: hsl(120, 100%, 40%);">+ centos8)</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "centos8"</span><br><span style="color: hsl(120, 100%, 40%);">+ ;;</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 from_line</span><br><span> local pull_arg</span><br><span>@@ -16,13 +32,17 @@</span><br><span> pull_arg=""</span><br><span> fi</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- echo "Building image: $i (export NO_DOCKER_IMAGE_BUILD=1 to prevent this)"</span><br><span style="color: hsl(0, 100%, 40%);">- PULL="$pull_arg" make -C "../$i" || exit 1</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "Building image: $i:$DOCKER_TAG (export NO_DOCKER_IMAGE_BUILD=1 to prevent this)"</span><br><span style="color: hsl(120, 100%, 40%);">+ make -C "../$i" \</span><br><span style="color: hsl(120, 100%, 40%);">+ PULL="$pull_arg" \</span><br><span style="color: hsl(120, 100%, 40%);">+ DISTRO="$DISTRO" \</span><br><span style="color: hsl(120, 100%, 40%);">+ DOCKER_TAG="$DOCKER_TAG" \</span><br><span style="color: hsl(120, 100%, 40%);">+ || exit 1</span><br><span> fi</span><br><span> </span><br><span> # Detect missing images (build skipped)</span><br><span style="color: hsl(0, 100%, 40%);">- if ! docker_image_exists "$i"; then</span><br><span style="color: hsl(0, 100%, 40%);">- echo "ERROR: missing image: $i"</span><br><span style="color: hsl(120, 100%, 40%);">+ if ! docker_image_exists "$i:$DOCKER_TAG"; then</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "ERROR: missing image: $i:$DOCKER_TAG"</span><br><span> exit 1</span><br><span> fi</span><br><span> done</span><br><span>@@ -96,3 +116,10 @@</span><br><span> SUITE_NAME=`basename $PWD`</span><br><span> </span><br><span> NET_NAME=$SUITE_NAME</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+DISTRO="${DISTRO:-debian-stretch}"</span><br><span style="color: hsl(120, 100%, 40%);">+DOCKER_TAG="$(docker_get_tag)"</span><br><span style="color: hsl(120, 100%, 40%);">+if [ -z "$DOCKER_TAG" ]; then</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "ERROR: failed to translate DISTRO=$DISTRO to docker tag!"</span><br><span style="color: hsl(120, 100%, 40%);">+ exit 1</span><br><span style="color: hsl(120, 100%, 40%);">+fi</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/docker-playground/+/18553">change 18553</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/+/18553"/><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: I598a262fe1a7ed4dd89e13c53e4ded103c6e3b91 </div>
<div style="display:none"> Gerrit-Change-Number: 18553 </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>