<p>osmith has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ci/+/16870">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">docker_images_require: add symlink code path<br><br>Make development easier by skipping fetch, checkout and reset --hard if<br>_docker_playground is a symlink.<br><br>Change-Id: If6209ff71488d39e590f5f8506b9d73ad0314846<br>---<br>M scripts/common.sh<br>1 file changed, 16 insertions(+), 10 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/70/16870/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/scripts/common.sh b/scripts/common.sh</span><br><span>index 6d28cfc..340bac8 100644</span><br><span>--- a/scripts/common.sh</span><br><span>+++ b/scripts/common.sh</span><br><span>@@ -117,18 +117,24 @@</span><br><span> docker_images_require() {</span><br><span>         local oldpwd="$PWD"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-       # Get docker-plaground.git</span><br><span style="color: hsl(0, 100%, 40%);">-      if [ -d "_docker_playground" ]; then</span><br><span style="color: hsl(0, 100%, 40%);">-          git -C _docker_playground fetch</span><br><span style="color: hsl(120, 100%, 40%);">+       if [ -L "_docker_playground" ]; then</span><br><span style="color: hsl(120, 100%, 40%);">+                echo "NOTE: _docker_playground is a symlink, skipping fetch, checkout, reset"</span><br><span style="color: hsl(120, 100%, 40%);">+               cd "_docker_playground/$1"</span><br><span>         else</span><br><span style="color: hsl(0, 100%, 40%);">-            git clone https://git.osmocom.org/docker-playground/ _docker_playground</span><br><span style="color: hsl(0, 100%, 40%);">- fi</span><br><span style="color: hsl(0, 100%, 40%);">-      cd _docker_playground</span><br><span style="color: hsl(0, 100%, 40%);">-   git checkout "$OSMO_BRANCH_DOCKER_PLAYGROUND"</span><br><span style="color: hsl(0, 100%, 40%);">- git reset --hard "origin/$OSMO_BRANCH_DOCKER_PLAYGROUND"</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> </span><br><span style="color: hsl(0, 100%, 40%);">-  # jenkins-common.sh expects to run from a subdir in docker-playground.git</span><br><span style="color: hsl(0, 100%, 40%);">-       cd "$1"</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%);">+     fi</span><br><span> </span><br><span>       # Subshell: run docker_images_require from jenkins-common.sh, pass all arguments</span><br><span>     (. ../jenkins-common.sh; docker_images_require "$@")</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ci/+/16870">change 16870</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/+/16870"/><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: If6209ff71488d39e590f5f8506b9d73ad0314846 </div>
<div style="display:none"> Gerrit-Change-Number: 16870 </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>