From 932b0037506130692bc8a1aa1edd95d5f54efd11 Mon Sep 17 00:00:00 2001
From: Oliver Smith <osmith@sysmocom.de>
Date: Fri, 2 Aug 2019 16:24:36 +0200
Subject: gerrit, master builds: use ASCIIDOC_WARNINGS_CHECK

The asciidoc warnings check fails the build if asciidoc prints a warning
while building the documentation. We had this enabled by default, but
since OBS uses various asciidoc versions, we could get unexpected build
failures (different asciidoc versions print different warnings).

Now that it is disabled by default, explicitly enable it for jenkins
again.

Related: OS#4140
Depends: Iac993a0d1b17205397a1f1ef1a7bd3f9df739e36 (osmo-gsm-manuals)
Change-Id: I8775d45b4dc1a5a46e2ba042fc7ee7d9f10f18cc
---
 jobs/master-builds.yml | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

(limited to 'jobs/master-builds.yml')

diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml
index fc5744b..ed180a4 100644
--- a/jobs/master-builds.yml
+++ b/jobs/master-builds.yml
@@ -19,7 +19,7 @@
     combination_filter: ''
     sequential: false
     # most common build invocation (PUBLISH=1 is prepended to publish manual PDFs)
-    cmd: ./contrib/jenkins.sh
+    cmd: ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh
     wrappers: []
     trigger:
     email: jenkins-notifications@lists.osmocom.org laforge@gnumonks.org
@@ -83,7 +83,7 @@
             master-osmo-iuh,
             master-osmo-msc,
             master-osmo-sgsn
-          cmd: WITH_MANUALS=1 PUBLISH=1 ./contrib/jenkins.sh
+          cmd: WITH_MANUALS=1 PUBLISH=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh
 
       - libosmocore:
           a1_name: arch
@@ -159,6 +159,7 @@
               -e OSMOPY_DEBUG_TCP_SOCKETS="1" \
               -e WITH_MANUALS="1" \
               -e PUBLISH="1" \
+              -e ASCIIDOC_WARNINGS_CHECK="1" \
               -w /build -i -u build \
               -v "$PWD:/build" \
               -v "$HOME/bin:/build_bin" \
@@ -177,6 +178,7 @@
               -e OSMOPY_DEBUG_TCP_SOCKETS="1" \
               -e WITH_MANUALS="1" \
               -e PUBLISH="1" \
+              -e ASCIIDOC_WARNINGS_CHECK="1" \
               -w /build -i -u build \
               -v "$PWD:/build" -v "$HOME/bin:/build_bin" \
               -v "$HOME/.ssh:/home/build/.ssh:ro" \
@@ -199,7 +201,7 @@
             (FIRMWARE_VERSION == "v2017.01" && BTS_MODEL == "lc15" && WITH_MANUALS == "0") ||
             (FIRMWARE_VERSION == "origin/nrw/litecell15" && BTS_MODEL == "lc15" && WITH_MANUALS == "0") ||
             (FIRMWARE_VERSION == "origin/nrw/oc2g" && BTS_MODEL == "oc2g" && WITH_MANUALS == "0")
-          cmd: 'PUBLISH=1 ./contrib/jenkins_bts_model.sh "$BTS_MODEL"'
+          cmd: 'PUBLISH=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins_bts_model.sh "$BTS_MODEL"'
 
       - osmo-ggsn:
           a1_name: GTP
@@ -209,7 +211,7 @@
           combination_filter: >
             (GTP == "--enable-gtp-linux" && WITH_MANUALS == "0") ||
             (GTP == "--disable-gtp-linux" && WITH_MANUALS == "1")
-          cmd: PUBLISH=1 ./contrib/jenkins.sh
+          cmd: PUBLISH=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh
           trigger: master-osmo-sgsn
 
       - osmo-gmr:
@@ -224,7 +226,7 @@
           cmd: PUBLISH=1 ./contrib/jenkins-build-manuals.sh
 
       - osmo-hlr:
-          cmd: WITH_MANUALS=1 PUBLISH=1 ./contrib/jenkins.sh
+          cmd: WITH_MANUALS=1 PUBLISH=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh
 
       - osmo-iuh:
           cmd: WITH_MANUALS=1 PUBLISH=1 ./contrib/jenkins.sh
@@ -247,6 +249,7 @@
               -e OSMOPY_DEBUG_TCP_SOCKETS="1" \
               -e WITH_MANUALS="1" \
               -e PUBLISH="1" \
+              -e ASCIIDOC_WARNINGS_CHECK="1" \
               -w /build -i -u build \
               -v "$PWD:/build" -v "$HOME/bin:/build_bin" \
               -v "$HOME/.ssh:/home/build/.ssh:ro" \
@@ -276,6 +279,7 @@
               -e PATH="$PATH:/build_bin" \
               -e OSMOPY_DEBUG_TCP_SOCKETS="1" \
               -e PUBLISH="1" \
+              -e ASCIIDOC_WARNINGS_CHECK="1" \
               -w /build -u build \
               -v "$PWD:/build" -v "$HOME/bin:/build_bin" \
               -v "$ARTIFACT_STORE:/artifact_store" \
@@ -305,7 +309,7 @@
             (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="v2017.01" && WITH_MANUALS == "0") ||
             (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="origin/nrw/litecell15" && WITH_MANUALS == "0") ||
             (with_vty == "False" && with_dsp == "none" && FIRMWARE_VERSION=="master" && WITH_MANUALS == "1")
-          cmd: PUBLISH=1 ./contrib/jenkins.sh
+          cmd: PUBLISH=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh
 
       - osmo-sgsn:
           a1_name: IU
@@ -326,6 +330,7 @@
               -e PATH="$PATH:/build_bin" \
               -e OSMOPY_DEBUG_TCP_SOCKETS="1" \
               -e PUBLISH="1" \
+              -e ASCIIDOC_WARNINGS_CHECK="1" \
               -w /build -i -u build \
               -v "$PWD:/build" -v "$HOME/bin:/build_bin" \
               -v "$HOME/.ssh:/home/build/.ssh:ro" \
@@ -333,7 +338,7 @@
 
       - osmo-sip-connector:
           email: gerrit-log@lists.osmocom.org laforge@gnumonks.org holger@freyther.de
-          cmd: WITH_MANUALS=1 PUBLISH=1 ./contrib/jenkins.sh
+          cmd: WITH_MANUALS=1 PUBLISH=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh
 
       - osmo-tetra:
           email: gerrit-log@lists.osmocom.org laforge@gnumonks.org 246tnt@gmail.com
@@ -348,10 +353,10 @@
           concurrent: true
           combination_filter: >
             (INSTR == "--with-sse" && WITH_MANUALS == "1")
-          cmd: PUBLISH=1 ./contrib/jenkins.sh
+          cmd: PUBLISH=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh
 
       - osmocom-bb:
-          cmd: WITH_MANUALS=1 PUBLISH=1 ./contrib/jenkins.sh
+          cmd: WITH_MANUALS=1 PUBLISH=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh
 
       - osmo-sysmon
       - osmo-remsim
-- 
cgit v1.2.3