osmocom
/
osmo-ci
mirror of https://gerrit.osmocom.org/osmo-ci
10
0
Fork 1
Code Releases Activity

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
This commit is contained in:
Oliver Smith 2021-01-12 11:24:45 +01:00
parent de5aa17d6d
commit 24a5609f30
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
jobs/gerrit-verifications.yml
View File

@ -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

14
jobs/master-builds.yml
View File

@ -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