Change in ...osmo-ci[master]: gerrit, master builds: use ASCIIDOC_WARNINGS_CHECK

osmith gerrit-no-reply at lists.osmocom.org
Fri Aug 2 14:32:50 UTC 2019


osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/15029


Change subject: gerrit, master builds: use ASCIIDOC_WARNINGS_CHECK
......................................................................

gerrit, master builds: use ASCIIDOC_WARNINGS_CHECK

Explicitly check for asciidoc warnings when running with jenkins, so we
can disable it by default. Since the binary packages for various
distributions are built with various asciidoc versions, which may throw
different warnings compared to what the version installed on the jenkins
slave does, it does not make sense to have this check on by default.

Related: OS#4140
Depends: Iac993a0d1b17205397a1f1ef1a7bd3f9df739e36 (osmo-gsm-manuals)
Change-Id: I8775d45b4dc1a5a46e2ba042fc7ee7d9f10f18cc
---
M jobs/gerrit-verifications.yml
M jobs/master-builds.yml
2 files changed, 26 insertions(+), 16 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/29/15029/1

diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml
index a696d86..08f9b49 100644
--- a/jobs/gerrit-verifications.yml
+++ b/jobs/gerrit-verifications.yml
@@ -20,7 +20,7 @@
     combination_filter: ''
     sequential: false
     # most common build invocation
-    cmd: ./contrib/jenkins.sh
+    cmd: ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh
     repos_url: 'ssh://jenkins@gerrit.osmocom.org:29418/{repos}'
     gerrit_project: '{repos}'
 
@@ -46,7 +46,7 @@
       - libosmo-abis
       - libosmo-netif
       - libosmo-sccp:
-          cmd: WITH_MANUALS=1 ./contrib/jenkins.sh
+          cmd: WITH_MANUALS=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh
 
       - libosmocore:
           a1_name: arch
@@ -81,6 +81,7 @@
               -e PATH="$PATH:/build_bin" \
               -e OSMOPY_DEBUG_TCP_SOCKETS="1" \
               -e WITH_MANUALS="1" \
+              -e ASCIIDOC_WARNINGS_CHECK="1" \
               -w /build -i -u build \
               -v "$PWD:/build" \
               -v "$HOME/bin:/build_bin" \
@@ -102,6 +103,7 @@
               -e PATH="$PATH:/build_bin" \
               -e OSMOPY_DEBUG_TCP_SOCKETS="1" \
               -e WITH_MANUALS="1" \
+              -e ASCIIDOC_WARNINGS_CHECK="1" \
               -w /build -i -u build \
               -v "$PWD:/build" -v "$HOME/bin:/build_bin" \
               osmocom:amd64 /build/contrib/jenkins.sh
@@ -124,7 +126,7 @@
             (FIRMWARE_VERSION == "litecell15" && BTS_MODEL == "lc15" && WITH_MANUALS == "0") ||
             (FIRMWARE_VERSION == "oc2g" && BTS_MODEL == "oc2g" && WITH_MANUALS == "0") ||
             (FIRMWARE_VERSION == "oc2g-next" && BTS_MODEL == "oc2g" && WITH_MANUALS == "0")
-          cmd: './contrib/jenkins_bts_model.sh "$BTS_MODEL"'
+          cmd: ASCIIDOC_WARNINGS_CHECK="1" './contrib/jenkins_bts_model.sh "$BTS_MODEL"'
 
       - osmo-ggsn:
           a1_name: GTP
@@ -134,12 +136,12 @@
           combination_filter: >
             (GTP == "--enable-gtp-linux" && WITH_MANUALS == "0") ||
             (GTP == "--disable-gtp-linux" && WITH_MANUALS == "1")
-          cmd: ./contrib/jenkins.sh
+          cmd: ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh
 
       - osmo-gsm-manuals
 
       - osmo-hlr:
-          cmd: WITH_MANUALS=1 ./contrib/jenkins.sh
+          cmd: WITH_MANUALS=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh
 
       - osmo-iuh
 
@@ -153,6 +155,7 @@
               -e PATH="$PATH:/build_bin" \
               -e OSMOPY_DEBUG_TCP_SOCKETS="1" \
               -e WITH_MANUALS="1" \
+              -e ASCIIDOC_WARNINGS_CHECK="1" \
               -w /build -i -u build \
               -v "$PWD:/build" -v "$HOME/bin:/build_bin" \
               osmocom:amd64 /build/contrib/jenkins.sh
@@ -177,6 +180,7 @@
               -e PARALLEL_MAKE="$PARALLEL_MAKE" \
               -e IU="$IU" \
               -e WITH_MANUALS="$WITH_MANUALS" \
+              -e ASCIIDOC_WARNINGS_CHECK="1" \
               -e PATH="$PATH:/build_bin" \
               -e OSMOPY_DEBUG_TCP_SOCKETS="1" \
               -w /build -u build \
@@ -224,6 +228,7 @@
               -e PARALLEL_MAKE="$PARALLEL_MAKE" \
               -e IU="$IU" \
               -e WITH_MANUALS="$WITH_MANUALS" \
+              -e ASCIIDOC_WARNINGS_CHECK="1" \
               -e PATH="$PATH:/build_bin" \
               -e OSMOPY_DEBUG_TCP_SOCKETS="1" \
               -w /build -i -u build \
@@ -231,7 +236,7 @@
               osmocom:amd64 /build/contrib/jenkins.sh
 
       - osmo-sip-connector:
-          cmd: WITH_MANUALS=1 ./contrib/jenkins.sh
+          cmd: WITH_MANUALS=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh
 
       - osmo-trx:
           a1_name: INSTR
@@ -245,7 +250,7 @@
             (INSTR == "--with-sse" && WITH_MANUALS == "1")
 
       - osmocom-bb:
-          cmd: WITH_MANUALS=1 ./contrib/jenkins.sh
+          cmd: WITH_MANUALS=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh
       - osmo-tetra
       - osmo-sysmon
       - osmo-remsim
diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml
index 373e975..3417dc3 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 at lists.osmocom.org laforge at 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:
           # Full triggers would be:
@@ -246,6 +248,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" \
@@ -275,6 +278,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" \
@@ -304,7 +308,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
@@ -325,6 +329,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" \
@@ -332,7 +337,7 @@
 
       - osmo-sip-connector:
           email: gerrit-log at lists.osmocom.org laforge at gnumonks.org holger at 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 at lists.osmocom.org laforge at gnumonks.org 246tnt at gmail.com
@@ -347,10 +352,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

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/15029
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I8775d45b4dc1a5a46e2ba042fc7ee7d9f10f18cc
Gerrit-Change-Number: 15029
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190802/4cded8dc/attachment.html>


More information about the gerrit-log mailing list