<p>osmith has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ci/+/14652">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">common.sh: add docker_images_require<br><br>Clone docker-playground.git, source its jenkins-common.sh and run<br>docker_images_require from there. This will make it possible to run<br>osmocom-release-tarballs.sh in a docker container, for which the<br>Dockerfile is stored in docker-playground.git.<br><br>Related: OS#3870<br>Change-Id: Ic4519ccb6978793054869862f8ca0e21d9cf5be4<br>---<br>M .gitignore<br>M scripts/common.sh<br>2 files changed, 27 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/52/14652/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/.gitignore b/.gitignore</span><br><span>index ff207ee..459f2c9 100644</span><br><span>--- a/.gitignore</span><br><span>+++ b/.gitignore</span><br><span>@@ -9,6 +9,7 @@</span><br><span> _temp/</span><br><span> _deps/</span><br><span> _release_tarballs/</span><br><span style="color: hsl(120, 100%, 40%);">+_docker_playground</span><br><span> </span><br><span> # osmocom-nightly-packages.sh</span><br><span> nightly-3g_*</span><br><span>diff --git a/scripts/common.sh b/scripts/common.sh</span><br><span>index 2cf31a5..bf24fc4 100644</span><br><span>--- a/scripts/common.sh</span><br><span>+++ b/scripts/common.sh</span><br><span>@@ -27,6 +27,8 @@</span><br><span>         osmocom-bb</span><br><span> "</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+OSMO_BRANCH_DOCKER_PLAYGROUND="${OSMO_BRANCH_DOCKER_PLAYGROUND:-master}"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> # Print commit of HEAD for an Osmocom git repository, e.g.:</span><br><span> # "f90496f577e78944ce8db1aa5b900477c1e479b0"</span><br><span> # $1: repository</span><br><span>@@ -96,3 +98,27 @@</span><br><span>                     ;;</span><br><span>   esac</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+# Build docker images from docker-playground.git.</span><br><span style="color: hsl(120, 100%, 40%);">+# $1...$n: docker image names (e.g. "debian-stretch-build")</span><br><span style="color: hsl(120, 100%, 40%);">+docker_images_require() {</span><br><span style="color: hsl(120, 100%, 40%);">+      local oldpwd="$PWD"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+       # Get docker-plaground.git</span><br><span style="color: hsl(120, 100%, 40%);">+    if [ -d "_docker_playground" ]; then</span><br><span style="color: hsl(120, 100%, 40%);">+                git -C _docker_playground fetch</span><br><span style="color: hsl(120, 100%, 40%);">+       else</span><br><span style="color: hsl(120, 100%, 40%);">+          git clone https://git.osmocom.org/docker-playground/ _docker_playground</span><br><span style="color: hsl(120, 100%, 40%);">+       fi</span><br><span style="color: hsl(120, 100%, 40%);">+    cd _docker_playground</span><br><span style="color: hsl(120, 100%, 40%);">+ git checkout "$OSMO_BRANCH_DOCKER_PLAYGROUND"</span><br><span style="color: hsl(120, 100%, 40%);">+       git reset --hard "origin/$OSMO_BRANCH_DOCKER_PLAYGROUND"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+  # jenkins-common.sh expects to run from a subdir in docker-playground.git</span><br><span style="color: hsl(120, 100%, 40%);">+     cd "$1"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+   # Subshell: run docker_images_require from jenkins-common.sh, pass all arguments</span><br><span style="color: hsl(120, 100%, 40%);">+      (. ../jenkins-common.sh; docker_images_require "$@")</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+      cd "$oldpwd"</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ci/+/14652">change 14652</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/osmo-ci/+/14652"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-ci </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ic4519ccb6978793054869862f8ca0e21d9cf5be4 </div>
<div style="display:none"> Gerrit-Change-Number: 14652 </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>