summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOliver Smith <osmith@sysmocom.de>2019-08-02 16:24:36 +0200
committerosmith <osmith@sysmocom.de>2019-08-21 11:46:24 +0000
commit932b0037506130692bc8a1aa1edd95d5f54efd11 (patch)
treef4e815ce317c0cd3f0694b8421947bce244e31dc
parent84e2ce3d6e0513d3001e8bd2662b7ae78846494d (diff)
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
-rw-r--r--jobs/gerrit-verifications.yml19
-rw-r--r--jobs/master-builds.yml23
2 files changed, 26 insertions, 16 deletions
diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml
index 0b983dd..cb370e9 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:
cmd: WITH_MANUALS=1 ./contrib/jenkins.sh
@@ -154,6 +156,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
@@ -178,6 +181,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 \
@@ -225,6 +229,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 \
@@ -232,7 +237,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
@@ -246,7 +251,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 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