<p>osmith has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ci/+/22131">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">jobs: update OSMO_GSM_MANUALS_DIR<br><br>Use new location inside / outside docker, where the repository was<br>cloned already. So it does not need to be cloned during the job.<br><br>Roll out: make sure that the docker images are already built! (or let me<br>merge it)<br><br>Related: OS#4912<br>Depends: docker-playground Id402e0ea372b5ca8a6c8f6f5beb190544c888207<br>Change-Id: Ibe91a613162687589e006cba99193606fb8a3eb9<br>---<br>M jobs/gerrit-verifications.yml<br>M jobs/master-builds.yml<br>2 files changed, 9 insertions(+), 9 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/31/22131/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml</span><br><span>index fbefbdb..99bfcce 100644</span><br><span>--- a/jobs/gerrit-verifications.yml</span><br><span>+++ b/jobs/gerrit-verifications.yml</span><br><span>@@ -34,7 +34,7 @@</span><br><span>               -e JOB_NAME="$JOB_NAME" \</span><br><span>               -e MAKE=make \</span><br><span>               -e OSMOPY_DEBUG_TCP_SOCKETS="1" \</span><br><span style="color: hsl(0, 100%, 40%);">-              -e OSMO_GSM_MANUALS_DIR="/build/deps/osmo-gsm-manuals" \</span><br><span style="color: hsl(120, 100%, 40%);">+              -e OSMO_GSM_MANUALS_DIR="/opt/osmo-gsm-manuals" \</span><br><span>               -e PARALLEL_MAKE="$PARALLEL_MAKE" \</span><br><span>               -e WITH_MANUALS="1" \</span><br><span>               -w /build -i -u build \</span><br><span>@@ -113,7 +113,7 @@</span><br><span>           concurrent: false</span><br><span>           cmd: |</span><br><span>             export ASCIIDOC_WARNINGS_CHECK="1"</span><br><span style="color: hsl(0, 100%, 40%);">-            export OSMO_GSM_MANUALS_DIR="$PWD/deps/osmo-gsm-manuals"</span><br><span style="color: hsl(120, 100%, 40%);">+            export OSMO_GSM_MANUALS_DIR="$HOME/osmo-gsm-manuals"</span><br><span>             {timeout_cmd} ./contrib/jenkins_bts_model.sh "$BTS_MODEL"</span><br><span> </span><br><span>       - osmo_dia2gsup:</span><br><span>@@ -133,7 +133,7 @@</span><br><span>               -e JOB_NAME="$JOB_NAME" \</span><br><span>               -e MAKE=make \</span><br><span>               -e OSMOPY_DEBUG_TCP_SOCKETS="1" \</span><br><span style="color: hsl(0, 100%, 40%);">-              -e OSMO_GSM_MANUALS_DIR="/build/deps/osmo-gsm-manuals" \</span><br><span style="color: hsl(120, 100%, 40%);">+              -e OSMO_GSM_MANUALS_DIR="/opt/osmo-gsm-manuals" \</span><br><span>               -e PARALLEL_MAKE="$PARALLEL_MAKE" \</span><br><span>               -e WITH_MANUALS="1" \</span><br><span>               -w /build -i -u build \</span><br><span>@@ -247,7 +247,7 @@</span><br><span>             (INSTR == "--with-neon-vfpv4" && WITH_MANUALS == "0" && label == "rpi4-deb9build-ansible")</span><br><span>           cmd: |</span><br><span>             export ASCIIDOC_WARNINGS_CHECK=1</span><br><span style="color: hsl(0, 100%, 40%);">-            export OSMO_GSM_MANUALS_DIR="$PWD/deps/osmo-gsm-manuals"</span><br><span style="color: hsl(120, 100%, 40%);">+            export OSMO_GSM_MANUALS_DIR="$HOME/osmo-gsm-manuals"</span><br><span>             {timeout_cmd} ./contrib/jenkins.sh</span><br><span> </span><br><span>       - osmocom-bb</span><br><span>diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml</span><br><span>index c648a7b..4b0f621 100644</span><br><span>--- a/jobs/master-builds.yml</span><br><span>+++ b/jobs/master-builds.yml</span><br><span>@@ -33,7 +33,7 @@</span><br><span>               -e JOB_NAME="$JOB_NAME" \</span><br><span>               -e MAKE=make \</span><br><span>               -e OSMOPY_DEBUG_TCP_SOCKETS="1" \</span><br><span style="color: hsl(0, 100%, 40%);">-              -e OSMO_GSM_MANUALS_DIR="/build/deps/osmo-gsm-manuals" \</span><br><span style="color: hsl(120, 100%, 40%);">+              -e OSMO_GSM_MANUALS_DIR="/opt/osmo-gsm-manuals" \</span><br><span>               -e PARALLEL_MAKE="$PARALLEL_MAKE" \</span><br><span>               -e PUBLISH="1" \</span><br><span>               -e WITH_MANUALS="1" \</span><br><span>@@ -197,7 +197,7 @@</span><br><span>           concurrent: false</span><br><span>           cmd: |</span><br><span>             export ASCIIDOC_WARNINGS_CHECK=1</span><br><span style="color: hsl(0, 100%, 40%);">-            export OSMO_GSM_MANUALS_DIR="$PWD/deps/osmo-gsm-manuals"</span><br><span style="color: hsl(120, 100%, 40%);">+            export OSMO_GSM_MANUALS_DIR="$HOME/osmo-gsm-manuals"</span><br><span>             export PUBLISH=1</span><br><span>             ./contrib/jenkins_bts_model.sh "$BTS_MODEL"</span><br><span> </span><br><span>@@ -213,7 +213,7 @@</span><br><span>               -e JOB_NAME="$JOB_NAME" \</span><br><span>               -e MAKE=make \</span><br><span>               -e OSMOPY_DEBUG_TCP_SOCKETS="1" \</span><br><span style="color: hsl(0, 100%, 40%);">-              -e OSMO_GSM_MANUALS_DIR="/build/deps/osmo-gsm-manuals" \</span><br><span style="color: hsl(120, 100%, 40%);">+              -e OSMO_GSM_MANUALS_DIR="/opt/osmo-gsm-manuals" \</span><br><span>               -e PARALLEL_MAKE="$PARALLEL_MAKE" \</span><br><span>               -e PUBLISH="1" \</span><br><span>               -e WITH_MANUALS="1" \</span><br><span>@@ -236,7 +236,7 @@</span><br><span>               -e JOB_NAME="$JOB_NAME" \</span><br><span>               -e MAKE=make \</span><br><span>               -e OSMOPY_DEBUG_TCP_SOCKETS="1" \</span><br><span style="color: hsl(0, 100%, 40%);">-              -e OSMO_GSM_MANUALS_DIR="/build/deps/osmo-gsm-manuals" \</span><br><span style="color: hsl(120, 100%, 40%);">+              -e OSMO_GSM_MANUALS_DIR="/opt/osmo-gsm-manuals" \</span><br><span>               -e PARALLEL_MAKE="$PARALLEL_MAKE" \</span><br><span>               -e PUBLISH="1" \</span><br><span>               -e WITH_MANUALS="1" \</span><br><span>@@ -361,7 +361,7 @@</span><br><span>             (INSTR == "--with-neon-vfpv4" && WITH_MANUALS == "0" && label == "rpi4-deb9build-ansible")</span><br><span>           cmd: |</span><br><span>             export ASCIIDOC_WARNINGS_CHECK=1</span><br><span style="color: hsl(0, 100%, 40%);">-            export OSMO_GSM_MANUALS_DIR="$PWD/deps/osmo-gsm-manuals"</span><br><span style="color: hsl(120, 100%, 40%);">+            export OSMO_GSM_MANUALS_DIR="$HOME/osmo-gsm-manuals"</span><br><span>             export PUBLISH=1</span><br><span>             ./contrib/jenkins.sh</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ci/+/22131">change 22131</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/+/22131"/><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: Ibe91a613162687589e006cba99193606fb8a3eb9 </div>
<div style="display:none"> Gerrit-Change-Number: 22131 </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>