<p>osmith has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ci/+/22111">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">jobs: add missing OSMO_GSM_MANUALS_DIR<br><br>Add the variable to projects that don't use docker at all or overwrite<br>docker_run instead of using the global variable that has<br>OSMO_GSM_MANUALS_DIR defined.<br><br>Related: OS#4912<br>Change-Id: I65102655b4b3e907a0b0de8026f8f9af76281f90<br>---<br>M jobs/gerrit-verifications.yml<br>M jobs/master-builds.yml<br>2 files changed, 21 insertions(+), 4 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/11/22111/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 d2e37cf..fbefbdb 100644</span><br><span>--- a/jobs/gerrit-verifications.yml</span><br><span>+++ b/jobs/gerrit-verifications.yml</span><br><span>@@ -111,7 +111,10 @@</span><br><span>             (FIRMWARE_VERSION == "oc2g" && BTS_MODEL == "oc2g" && WITH_MANUALS == "0" && label == "osmocom-master-debian9") ||</span><br><span>             (FIRMWARE_VERSION == "oc2g-next" && BTS_MODEL == "oc2g" && WITH_MANUALS == "0" && label == "osmocom-master-debian9")</span><br><span>           concurrent: false</span><br><span style="color: hsl(0, 100%, 40%);">-          cmd: 'ASCIIDOC_WARNINGS_CHECK="1" {timeout_cmd} ./contrib/jenkins_bts_model.sh "$BTS_MODEL"'</span><br><span style="color: hsl(120, 100%, 40%);">+          cmd: |</span><br><span style="color: hsl(120, 100%, 40%);">+            export ASCIIDOC_WARNINGS_CHECK="1"</span><br><span style="color: hsl(120, 100%, 40%);">+            export OSMO_GSM_MANUALS_DIR="$PWD/deps/osmo-gsm-manuals"</span><br><span style="color: hsl(120, 100%, 40%);">+            {timeout_cmd} ./contrib/jenkins_bts_model.sh "$BTS_MODEL"</span><br><span> </span><br><span>       - osmo_dia2gsup:</span><br><span>           repos_url: '{gerrit_url}/erlang/{repos}'</span><br><span>@@ -130,6 +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(120, 100%, 40%);">+              -e OSMO_GSM_MANUALS_DIR="/build/deps/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>@@ -241,7 +245,10 @@</span><br><span>             (INSTR == "--with-sse" && WITH_MANUALS == "0" && label == "osmocom-master-debian9") ||</span><br><span>             (INSTR == "--with-neon" && WITH_MANUALS == "0" && label == "rpi4-deb9build-ansible") ||</span><br><span>             (INSTR == "--with-neon-vfpv4" && WITH_MANUALS == "0" && label == "rpi4-deb9build-ansible")</span><br><span style="color: hsl(0, 100%, 40%);">-          cmd: 'ASCIIDOC_WARNINGS_CHECK=1 {timeout_cmd} ./contrib/jenkins.sh'</span><br><span style="color: hsl(120, 100%, 40%);">+          cmd: |</span><br><span style="color: hsl(120, 100%, 40%);">+            export ASCIIDOC_WARNINGS_CHECK=1</span><br><span style="color: hsl(120, 100%, 40%);">+            export OSMO_GSM_MANUALS_DIR="$PWD/deps/osmo-gsm-manuals"</span><br><span style="color: hsl(120, 100%, 40%);">+            {timeout_cmd} ./contrib/jenkins.sh</span><br><span> </span><br><span>       - osmocom-bb</span><br><span>       - osmo-tetra</span><br><span>diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml</span><br><span>index 3c3daf8..c648a7b 100644</span><br><span>--- a/jobs/master-builds.yml</span><br><span>+++ b/jobs/master-builds.yml</span><br><span>@@ -195,7 +195,11 @@</span><br><span>             (FIRMWARE_VERSION == "origin/nrw/litecell15" && BTS_MODEL == "lc15" && WITH_MANUALS == "0" && label == "osmocom-master-debian9") ||</span><br><span>             (FIRMWARE_VERSION == "origin/nrw/oc2g" && BTS_MODEL == "oc2g" && WITH_MANUALS == "0" && label == "osmocom-master-debian9")</span><br><span>           concurrent: false</span><br><span style="color: hsl(0, 100%, 40%);">-          cmd: 'PUBLISH=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins_bts_model.sh "$BTS_MODEL"'</span><br><span style="color: hsl(120, 100%, 40%);">+          cmd: |</span><br><span style="color: hsl(120, 100%, 40%);">+            export ASCIIDOC_WARNINGS_CHECK=1</span><br><span style="color: hsl(120, 100%, 40%);">+            export OSMO_GSM_MANUALS_DIR="$PWD/deps/osmo-gsm-manuals"</span><br><span style="color: hsl(120, 100%, 40%);">+            export PUBLISH=1</span><br><span style="color: hsl(120, 100%, 40%);">+            ./contrib/jenkins_bts_model.sh "$BTS_MODEL"</span><br><span> </span><br><span>       - osmo-e1-hardware:</span><br><span>           docker_run: |</span><br><span>@@ -209,6 +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(120, 100%, 40%);">+              -e OSMO_GSM_MANUALS_DIR="/build/deps/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>@@ -231,6 +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(120, 100%, 40%);">+              -e OSMO_GSM_MANUALS_DIR="/build/deps/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>@@ -353,7 +359,11 @@</span><br><span>             (INSTR == "--with-sse" && WITH_MANUALS == "0" && label == "osmocom-master-debian9") ||</span><br><span>             (INSTR == "--with-neon" && WITH_MANUALS == "0" && label == "rpi4-deb9build-ansible") ||</span><br><span>             (INSTR == "--with-neon-vfpv4" && WITH_MANUALS == "0" && label == "rpi4-deb9build-ansible")</span><br><span style="color: hsl(0, 100%, 40%);">-          cmd: 'PUBLISH=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh'</span><br><span style="color: hsl(120, 100%, 40%);">+          cmd: |</span><br><span style="color: hsl(120, 100%, 40%);">+            export ASCIIDOC_WARNINGS_CHECK=1</span><br><span style="color: hsl(120, 100%, 40%);">+            export OSMO_GSM_MANUALS_DIR="$PWD/deps/osmo-gsm-manuals"</span><br><span style="color: hsl(120, 100%, 40%);">+            export PUBLISH=1</span><br><span style="color: hsl(120, 100%, 40%);">+            ./contrib/jenkins.sh</span><br><span> </span><br><span>       - osmocom-bb</span><br><span>       - osmo-sysmon</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ci/+/22111">change 22111</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/+/22111"/><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: I65102655b4b3e907a0b0de8026f8f9af76281f90 </div>
<div style="display:none"> Gerrit-Change-Number: 22111 </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>