<p>osmith <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ci/+/16870">View Change</a></p><div style="white-space:pre-wrap">Approvals:
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
osmith: Verified
</div><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. Document _docker_playground in<br>README.adoc and explain how to set up the symlink.<br><br>Change-Id: If6209ff71488d39e590f5f8506b9d73ad0314846<br>---<br>M README.adoc<br>M scripts/common.sh<br>2 files changed, 27 insertions(+), 10 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/README.adoc b/README.adoc</span><br><span>index aa45b58..786be0d 100644</span><br><span>--- a/README.adoc</span><br><span>+++ b/README.adoc</span><br><span>@@ -12,3 +12,14 @@</span><br><span> scripts: used by jenkins jobs. Various osmo*/contrib/jenkins.sh scripts assume</span><br><span> osmo-ci to be checked out in the build slave user's home, i.e. using a PATH of</span><br><span> $HOME/osmo-ci/scripts.</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+_docker_playground: Clone of docker-playground.git, so the scripts can build</span><br><span style="color: hsl(120, 100%, 40%);">+required docker images. This dir gets created on demand by scripts/common.sh,</span><br><span style="color: hsl(120, 100%, 40%);">+and automatically fetched and reset to "origin/master" (override with</span><br><span style="color: hsl(120, 100%, 40%);">+$OSMO_BRANCH_DOCKER_PLAYGROUND). The fetch and reset gets skipped if</span><br><span style="color: hsl(120, 100%, 40%);">+_docker_playground is a symlink. For development, set it up as follows:</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ $ git clone https://git.osmocom.org/docker-playground</span><br><span style="color: hsl(120, 100%, 40%);">+ $ git clone https://git.osmocom.org/osmo-ci</span><br><span style="color: hsl(120, 100%, 40%);">+ $ cd osmo-ci</span><br><span style="color: hsl(120, 100%, 40%);">+ $ ln -s ../docker-playground _docker_playground</span><br><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: 2 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>