<p>osmith <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ci/+/15029">View Change</a></p><div style="white-space:pre-wrap">Approvals:
osmith: Looks good to me, approved; Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gerrit, master builds: use ASCIIDOC_WARNINGS_CHECK<br><br>The asciidoc warnings check fails the build if asciidoc prints a warning<br>while building the documentation. We had this enabled by default, but<br>since OBS uses various asciidoc versions, we could get unexpected build<br>failures (different asciidoc versions print different warnings).<br><br>Now that it is disabled by default, explicitly enable it for jenkins<br>again.<br><br>Related: OS#4140<br>Depends: Iac993a0d1b17205397a1f1ef1a7bd3f9df739e36 (osmo-gsm-manuals)<br>Change-Id: I8775d45b4dc1a5a46e2ba042fc7ee7d9f10f18cc<br>---<br>M jobs/gerrit-verifications.yml<br>M jobs/master-builds.yml<br>2 files changed, 26 insertions(+), 16 deletions(-)<br><br></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 0b983dd..cb370e9 100644</span><br><span>--- a/jobs/gerrit-verifications.yml</span><br><span>+++ b/jobs/gerrit-verifications.yml</span><br><span>@@ -20,7 +20,7 @@</span><br><span> combination_filter: ''</span><br><span> sequential: false</span><br><span> # most common build invocation</span><br><span style="color: hsl(0, 100%, 40%);">- cmd: ./contrib/jenkins.sh</span><br><span style="color: hsl(120, 100%, 40%);">+ cmd: ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh</span><br><span> repos_url: 'ssh://jenkins@gerrit.osmocom.org:29418/{repos}'</span><br><span> gerrit_project: '{repos}'</span><br><span> </span><br><span>@@ -46,7 +46,7 @@</span><br><span> - libosmo-abis</span><br><span> - libosmo-netif</span><br><span> - libosmo-sccp:</span><br><span style="color: hsl(0, 100%, 40%);">- cmd: WITH_MANUALS=1 ./contrib/jenkins.sh</span><br><span style="color: hsl(120, 100%, 40%);">+ cmd: WITH_MANUALS=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh</span><br><span> </span><br><span> - libosmocore:</span><br><span> a1_name: arch</span><br><span>@@ -81,6 +81,7 @@</span><br><span> -e PATH="$PATH:/build_bin" \</span><br><span> -e OSMOPY_DEBUG_TCP_SOCKETS="1" \</span><br><span> -e WITH_MANUALS="1" \</span><br><span style="color: hsl(120, 100%, 40%);">+ -e ASCIIDOC_WARNINGS_CHECK="1" \</span><br><span> -w /build -i -u build \</span><br><span> -v "$PWD:/build" \</span><br><span> -v "$HOME/bin:/build_bin" \</span><br><span>@@ -102,6 +103,7 @@</span><br><span> -e PATH="$PATH:/build_bin" \</span><br><span> -e OSMOPY_DEBUG_TCP_SOCKETS="1" \</span><br><span> -e WITH_MANUALS="1" \</span><br><span style="color: hsl(120, 100%, 40%);">+ -e ASCIIDOC_WARNINGS_CHECK="1" \</span><br><span> -w /build -i -u build \</span><br><span> -v "$PWD:/build" -v "$HOME/bin:/build_bin" \</span><br><span> osmocom:amd64 /build/contrib/jenkins.sh</span><br><span>@@ -124,7 +126,7 @@</span><br><span> (FIRMWARE_VERSION == "litecell15" && BTS_MODEL == "lc15" && WITH_MANUALS == "0") ||</span><br><span> (FIRMWARE_VERSION == "oc2g" && BTS_MODEL == "oc2g" && WITH_MANUALS == "0") ||</span><br><span> (FIRMWARE_VERSION == "oc2g-next" && BTS_MODEL == "oc2g" && WITH_MANUALS == "0")</span><br><span style="color: hsl(0, 100%, 40%);">- cmd: './contrib/jenkins_bts_model.sh "$BTS_MODEL"'</span><br><span style="color: hsl(120, 100%, 40%);">+ cmd: ASCIIDOC_WARNINGS_CHECK="1" './contrib/jenkins_bts_model.sh "$BTS_MODEL"'</span><br><span> </span><br><span> - osmo-ggsn:</span><br><span> a1_name: GTP</span><br><span>@@ -134,12 +136,12 @@</span><br><span> combination_filter: ></span><br><span> (GTP == "--enable-gtp-linux" && WITH_MANUALS == "0") ||</span><br><span> (GTP == "--disable-gtp-linux" && WITH_MANUALS == "1")</span><br><span style="color: hsl(0, 100%, 40%);">- cmd: ./contrib/jenkins.sh</span><br><span style="color: hsl(120, 100%, 40%);">+ cmd: ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh</span><br><span> </span><br><span> - osmo-gsm-manuals</span><br><span> </span><br><span> - osmo-hlr:</span><br><span style="color: hsl(0, 100%, 40%);">- cmd: WITH_MANUALS=1 ./contrib/jenkins.sh</span><br><span style="color: hsl(120, 100%, 40%);">+ cmd: WITH_MANUALS=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh</span><br><span> </span><br><span> - osmo-iuh:</span><br><span> cmd: WITH_MANUALS=1 ./contrib/jenkins.sh</span><br><span>@@ -154,6 +156,7 @@</span><br><span> -e PATH="$PATH:/build_bin" \</span><br><span> -e OSMOPY_DEBUG_TCP_SOCKETS="1" \</span><br><span> -e WITH_MANUALS="1" \</span><br><span style="color: hsl(120, 100%, 40%);">+ -e ASCIIDOC_WARNINGS_CHECK="1" \</span><br><span> -w /build -i -u build \</span><br><span> -v "$PWD:/build" -v "$HOME/bin:/build_bin" \</span><br><span> osmocom:amd64 /build/contrib/jenkins.sh</span><br><span>@@ -178,6 +181,7 @@</span><br><span> -e PARALLEL_MAKE="$PARALLEL_MAKE" \</span><br><span> -e IU="$IU" \</span><br><span> -e WITH_MANUALS="$WITH_MANUALS" \</span><br><span style="color: hsl(120, 100%, 40%);">+ -e ASCIIDOC_WARNINGS_CHECK="1" \</span><br><span> -e PATH="$PATH:/build_bin" \</span><br><span> -e OSMOPY_DEBUG_TCP_SOCKETS="1" \</span><br><span> -w /build -u build \</span><br><span>@@ -225,6 +229,7 @@</span><br><span> -e PARALLEL_MAKE="$PARALLEL_MAKE" \</span><br><span> -e IU="$IU" \</span><br><span> -e WITH_MANUALS="$WITH_MANUALS" \</span><br><span style="color: hsl(120, 100%, 40%);">+ -e ASCIIDOC_WARNINGS_CHECK="1" \</span><br><span> -e PATH="$PATH:/build_bin" \</span><br><span> -e OSMOPY_DEBUG_TCP_SOCKETS="1" \</span><br><span> -w /build -i -u build \</span><br><span>@@ -232,7 +237,7 @@</span><br><span> osmocom:amd64 /build/contrib/jenkins.sh</span><br><span> </span><br><span> - osmo-sip-connector:</span><br><span style="color: hsl(0, 100%, 40%);">- cmd: WITH_MANUALS=1 ./contrib/jenkins.sh</span><br><span style="color: hsl(120, 100%, 40%);">+ cmd: WITH_MANUALS=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh</span><br><span> </span><br><span> - osmo-trx:</span><br><span> a1_name: INSTR</span><br><span>@@ -246,7 +251,7 @@</span><br><span> (INSTR == "--with-sse" && WITH_MANUALS == "1")</span><br><span> </span><br><span> - osmocom-bb:</span><br><span style="color: hsl(0, 100%, 40%);">- cmd: WITH_MANUALS=1 ./contrib/jenkins.sh</span><br><span style="color: hsl(120, 100%, 40%);">+ cmd: WITH_MANUALS=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh</span><br><span> - osmo-tetra</span><br><span> - osmo-sysmon</span><br><span> - osmo-remsim</span><br><span>diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml</span><br><span>index fc5744b..ed180a4 100644</span><br><span>--- a/jobs/master-builds.yml</span><br><span>+++ b/jobs/master-builds.yml</span><br><span>@@ -19,7 +19,7 @@</span><br><span> combination_filter: ''</span><br><span> sequential: false</span><br><span> # most common build invocation (PUBLISH=1 is prepended to publish manual PDFs)</span><br><span style="color: hsl(0, 100%, 40%);">- cmd: ./contrib/jenkins.sh</span><br><span style="color: hsl(120, 100%, 40%);">+ cmd: ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh</span><br><span> wrappers: []</span><br><span> trigger:</span><br><span> email: jenkins-notifications@lists.osmocom.org laforge@gnumonks.org</span><br><span>@@ -83,7 +83,7 @@</span><br><span> master-osmo-iuh,</span><br><span> master-osmo-msc,</span><br><span> master-osmo-sgsn</span><br><span style="color: hsl(0, 100%, 40%);">- cmd: WITH_MANUALS=1 PUBLISH=1 ./contrib/jenkins.sh</span><br><span style="color: hsl(120, 100%, 40%);">+ cmd: WITH_MANUALS=1 PUBLISH=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh</span><br><span> </span><br><span> - libosmocore:</span><br><span> a1_name: arch</span><br><span>@@ -159,6 +159,7 @@</span><br><span> -e OSMOPY_DEBUG_TCP_SOCKETS="1" \</span><br><span> -e WITH_MANUALS="1" \</span><br><span> -e PUBLISH="1" \</span><br><span style="color: hsl(120, 100%, 40%);">+ -e ASCIIDOC_WARNINGS_CHECK="1" \</span><br><span> -w /build -i -u build \</span><br><span> -v "$PWD:/build" \</span><br><span> -v "$HOME/bin:/build_bin" \</span><br><span>@@ -177,6 +178,7 @@</span><br><span> -e OSMOPY_DEBUG_TCP_SOCKETS="1" \</span><br><span> -e WITH_MANUALS="1" \</span><br><span> -e PUBLISH="1" \</span><br><span style="color: hsl(120, 100%, 40%);">+ -e ASCIIDOC_WARNINGS_CHECK="1" \</span><br><span> -w /build -i -u build \</span><br><span> -v "$PWD:/build" -v "$HOME/bin:/build_bin" \</span><br><span> -v "$HOME/.ssh:/home/build/.ssh:ro" \</span><br><span>@@ -199,7 +201,7 @@</span><br><span> (FIRMWARE_VERSION == "v2017.01" && BTS_MODEL == "lc15" && WITH_MANUALS == "0") ||</span><br><span> (FIRMWARE_VERSION == "origin/nrw/litecell15" && BTS_MODEL == "lc15" && WITH_MANUALS == "0") ||</span><br><span> (FIRMWARE_VERSION == "origin/nrw/oc2g" && BTS_MODEL == "oc2g" && WITH_MANUALS == "0")</span><br><span style="color: hsl(0, 100%, 40%);">- cmd: 'PUBLISH=1 ./contrib/jenkins_bts_model.sh "$BTS_MODEL"'</span><br><span style="color: hsl(120, 100%, 40%);">+ cmd: 'PUBLISH=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins_bts_model.sh "$BTS_MODEL"'</span><br><span> </span><br><span> - osmo-ggsn:</span><br><span> a1_name: GTP</span><br><span>@@ -209,7 +211,7 @@</span><br><span> combination_filter: ></span><br><span> (GTP == "--enable-gtp-linux" && WITH_MANUALS == "0") ||</span><br><span> (GTP == "--disable-gtp-linux" && WITH_MANUALS == "1")</span><br><span style="color: hsl(0, 100%, 40%);">- cmd: PUBLISH=1 ./contrib/jenkins.sh</span><br><span style="color: hsl(120, 100%, 40%);">+ cmd: PUBLISH=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh</span><br><span> trigger: master-osmo-sgsn</span><br><span> </span><br><span> - osmo-gmr:</span><br><span>@@ -224,7 +226,7 @@</span><br><span> cmd: PUBLISH=1 ./contrib/jenkins-build-manuals.sh</span><br><span> </span><br><span> - osmo-hlr:</span><br><span style="color: hsl(0, 100%, 40%);">- cmd: WITH_MANUALS=1 PUBLISH=1 ./contrib/jenkins.sh</span><br><span style="color: hsl(120, 100%, 40%);">+ cmd: WITH_MANUALS=1 PUBLISH=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh</span><br><span> </span><br><span> - osmo-iuh:</span><br><span> cmd: WITH_MANUALS=1 PUBLISH=1 ./contrib/jenkins.sh</span><br><span>@@ -247,6 +249,7 @@</span><br><span> -e OSMOPY_DEBUG_TCP_SOCKETS="1" \</span><br><span> -e WITH_MANUALS="1" \</span><br><span> -e PUBLISH="1" \</span><br><span style="color: hsl(120, 100%, 40%);">+ -e ASCIIDOC_WARNINGS_CHECK="1" \</span><br><span> -w /build -i -u build \</span><br><span> -v "$PWD:/build" -v "$HOME/bin:/build_bin" \</span><br><span> -v "$HOME/.ssh:/home/build/.ssh:ro" \</span><br><span>@@ -276,6 +279,7 @@</span><br><span> -e PATH="$PATH:/build_bin" \</span><br><span> -e OSMOPY_DEBUG_TCP_SOCKETS="1" \</span><br><span> -e PUBLISH="1" \</span><br><span style="color: hsl(120, 100%, 40%);">+ -e ASCIIDOC_WARNINGS_CHECK="1" \</span><br><span> -w /build -u build \</span><br><span> -v "$PWD:/build" -v "$HOME/bin:/build_bin" \</span><br><span> -v "$ARTIFACT_STORE:/artifact_store" \</span><br><span>@@ -305,7 +309,7 @@</span><br><span> (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="v2017.01" && WITH_MANUALS == "0") ||</span><br><span> (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="origin/nrw/litecell15" && WITH_MANUALS == "0") ||</span><br><span> (with_vty == "False" && with_dsp == "none" && FIRMWARE_VERSION=="master" && WITH_MANUALS == "1")</span><br><span style="color: hsl(0, 100%, 40%);">- cmd: PUBLISH=1 ./contrib/jenkins.sh</span><br><span style="color: hsl(120, 100%, 40%);">+ cmd: PUBLISH=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh</span><br><span> </span><br><span> - osmo-sgsn:</span><br><span> a1_name: IU</span><br><span>@@ -326,6 +330,7 @@</span><br><span> -e PATH="$PATH:/build_bin" \</span><br><span> -e OSMOPY_DEBUG_TCP_SOCKETS="1" \</span><br><span> -e PUBLISH="1" \</span><br><span style="color: hsl(120, 100%, 40%);">+ -e ASCIIDOC_WARNINGS_CHECK="1" \</span><br><span> -w /build -i -u build \</span><br><span> -v "$PWD:/build" -v "$HOME/bin:/build_bin" \</span><br><span> -v "$HOME/.ssh:/home/build/.ssh:ro" \</span><br><span>@@ -333,7 +338,7 @@</span><br><span> </span><br><span> - osmo-sip-connector:</span><br><span> email: gerrit-log@lists.osmocom.org laforge@gnumonks.org holger@freyther.de</span><br><span style="color: hsl(0, 100%, 40%);">- cmd: WITH_MANUALS=1 PUBLISH=1 ./contrib/jenkins.sh</span><br><span style="color: hsl(120, 100%, 40%);">+ cmd: WITH_MANUALS=1 PUBLISH=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh</span><br><span> </span><br><span> - osmo-tetra:</span><br><span> email: gerrit-log@lists.osmocom.org laforge@gnumonks.org 246tnt@gmail.com</span><br><span>@@ -348,10 +353,10 @@</span><br><span> concurrent: true</span><br><span> combination_filter: ></span><br><span> (INSTR == "--with-sse" && WITH_MANUALS == "1")</span><br><span style="color: hsl(0, 100%, 40%);">- cmd: PUBLISH=1 ./contrib/jenkins.sh</span><br><span style="color: hsl(120, 100%, 40%);">+ cmd: PUBLISH=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh</span><br><span> </span><br><span> - osmocom-bb:</span><br><span style="color: hsl(0, 100%, 40%);">- cmd: WITH_MANUALS=1 PUBLISH=1 ./contrib/jenkins.sh</span><br><span style="color: hsl(120, 100%, 40%);">+ cmd: WITH_MANUALS=1 PUBLISH=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh</span><br><span> </span><br><span> - osmo-sysmon</span><br><span> - osmo-remsim</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ci/+/15029">change 15029</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/+/15029"/><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: I8775d45b4dc1a5a46e2ba042fc7ee7d9f10f18cc </div>
<div style="display:none"> Gerrit-Change-Number: 15029 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@gnumonks.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>