diff options
| author | Oliver Smith <osmith@sysmocom.de> | 2021-01-12 11:24:45 +0100 |
|---|---|---|
| committer | Oliver Smith <osmith@sysmocom.de> | 2021-01-12 13:54:55 +0100 |
| commit | 24a5609f30bca6289862884dbfb2b6d706e47de2 (patch) | |
| tree | f22b48862f3beb2a7894bb5c1cd3802648a69c4f /jobs | |
| parent | de5aa17d6ddd103cfad90051358c44d87b7d705e (diff) | |
jobs: add missing OSMO_GSM_MANUALS_DIR
Add the variable to projects that don't use docker at all or overwrite
docker_run instead of using the global variable that has
OSMO_GSM_MANUALS_DIR defined.
Related: OS#4912
Change-Id: I65102655b4b3e907a0b0de8026f8f9af76281f90
Diffstat (limited to 'jobs')
| -rw-r--r-- | jobs/gerrit-verifications.yml | 11 | ||||
| -rw-r--r-- | jobs/master-builds.yml | 14 |
2 files changed, 21 insertions, 4 deletions
diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index d2e37cf..fbefbdb 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -111,7 +111,10 @@ (FIRMWARE_VERSION == "oc2g" && BTS_MODEL == "oc2g" && WITH_MANUALS == "0" && label == "osmocom-master-debian9") || (FIRMWARE_VERSION == "oc2g-next" && BTS_MODEL == "oc2g" && WITH_MANUALS == "0" && label == "osmocom-master-debian9") concurrent: false - cmd: 'ASCIIDOC_WARNINGS_CHECK="1" {timeout_cmd} ./contrib/jenkins_bts_model.sh "$BTS_MODEL"' + cmd: | + export ASCIIDOC_WARNINGS_CHECK="1" + export OSMO_GSM_MANUALS_DIR="$PWD/deps/osmo-gsm-manuals" + {timeout_cmd} ./contrib/jenkins_bts_model.sh "$BTS_MODEL" - osmo_dia2gsup: repos_url: '{gerrit_url}/erlang/{repos}' @@ -130,6 +133,7 @@ -e JOB_NAME="$JOB_NAME" \ -e MAKE=make \ -e OSMOPY_DEBUG_TCP_SOCKETS="1" \ + -e OSMO_GSM_MANUALS_DIR="/build/deps/osmo-gsm-manuals" \ -e PARALLEL_MAKE="$PARALLEL_MAKE" \ -e WITH_MANUALS="1" \ -w /build -i -u build \ @@ -241,7 +245,10 @@ (INSTR == "--with-sse" && WITH_MANUALS == "0" && label == "osmocom-master-debian9") || (INSTR == "--with-neon" && WITH_MANUALS == "0" && label == "rpi4-deb9build-ansible") || (INSTR == "--with-neon-vfpv4" && WITH_MANUALS == "0" && label == "rpi4-deb9build-ansible") - cmd: 'ASCIIDOC_WARNINGS_CHECK=1 {timeout_cmd} ./contrib/jenkins.sh' + cmd: | + export ASCIIDOC_WARNINGS_CHECK=1 + export OSMO_GSM_MANUALS_DIR="$PWD/deps/osmo-gsm-manuals" + {timeout_cmd} ./contrib/jenkins.sh - osmocom-bb - osmo-tetra diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 3c3daf8..c648a7b 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -195,7 +195,11 @@ (FIRMWARE_VERSION == "origin/nrw/litecell15" && BTS_MODEL == "lc15" && WITH_MANUALS == "0" && label == "osmocom-master-debian9") || (FIRMWARE_VERSION == "origin/nrw/oc2g" && BTS_MODEL == "oc2g" && WITH_MANUALS == "0" && label == "osmocom-master-debian9") concurrent: false - cmd: 'PUBLISH=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins_bts_model.sh "$BTS_MODEL"' + cmd: | + export ASCIIDOC_WARNINGS_CHECK=1 + export OSMO_GSM_MANUALS_DIR="$PWD/deps/osmo-gsm-manuals" + export PUBLISH=1 + ./contrib/jenkins_bts_model.sh "$BTS_MODEL" - osmo-e1-hardware: docker_run: | @@ -209,6 +213,7 @@ -e JOB_NAME="$JOB_NAME" \ -e MAKE=make \ -e OSMOPY_DEBUG_TCP_SOCKETS="1" \ + -e OSMO_GSM_MANUALS_DIR="/build/deps/osmo-gsm-manuals" \ -e PARALLEL_MAKE="$PARALLEL_MAKE" \ -e PUBLISH="1" \ -e WITH_MANUALS="1" \ @@ -231,6 +236,7 @@ -e JOB_NAME="$JOB_NAME" \ -e MAKE=make \ -e OSMOPY_DEBUG_TCP_SOCKETS="1" \ + -e OSMO_GSM_MANUALS_DIR="/build/deps/osmo-gsm-manuals" \ -e PARALLEL_MAKE="$PARALLEL_MAKE" \ -e PUBLISH="1" \ -e WITH_MANUALS="1" \ @@ -353,7 +359,11 @@ (INSTR == "--with-sse" && WITH_MANUALS == "0" && label == "osmocom-master-debian9") || (INSTR == "--with-neon" && WITH_MANUALS == "0" && label == "rpi4-deb9build-ansible") || (INSTR == "--with-neon-vfpv4" && WITH_MANUALS == "0" && label == "rpi4-deb9build-ansible") - cmd: 'PUBLISH=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh' + cmd: | + export ASCIIDOC_WARNINGS_CHECK=1 + export OSMO_GSM_MANUALS_DIR="$PWD/deps/osmo-gsm-manuals" + export PUBLISH=1 + ./contrib/jenkins.sh - osmocom-bb - osmo-sysmon |