diff options
| author | Oliver Smith <osmith@sysmocom.de> | 2021-01-12 13:50:44 +0100 |
|---|---|---|
| committer | Oliver Smith <osmith@sysmocom.de> | 2021-01-13 12:40:18 +0100 |
| commit | 212e43fa1c5632d8136876f2d7d99c7296fdd767 (patch) | |
| tree | 35ff91dd9606a9bb303ffb17797c902ce0f9c4ed | |
| parent | 5150f0ec62869ace587d83826d0fb0d690058f73 (diff) | |
jobs: update OSMO_GSM_MANUALS_DIR
Use new location inside / outside docker, where the repository was
cloned already. So it does not need to be cloned during the job.
Roll out: make sure that the docker images are already built! (or let me
merge it)
Related: OS#4912
Depends: docker-playground Id402e0ea372b5ca8a6c8f6f5beb190544c888207
Change-Id: Ibe91a613162687589e006cba99193606fb8a3eb9
| -rw-r--r-- | jobs/gerrit-verifications.yml | 8 | ||||
| -rw-r--r-- | jobs/master-builds.yml | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index fbefbdb..99bfcce 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -34,7 +34,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 OSMO_GSM_MANUALS_DIR="/opt/osmo-gsm-manuals" \ -e PARALLEL_MAKE="$PARALLEL_MAKE" \ -e WITH_MANUALS="1" \ -w /build -i -u build \ @@ -113,7 +113,7 @@ concurrent: false cmd: | export ASCIIDOC_WARNINGS_CHECK="1" - export OSMO_GSM_MANUALS_DIR="$PWD/deps/osmo-gsm-manuals" + export OSMO_GSM_MANUALS_DIR="$HOME/osmo-gsm-manuals" {timeout_cmd} ./contrib/jenkins_bts_model.sh "$BTS_MODEL" - osmo_dia2gsup: @@ -133,7 +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 OSMO_GSM_MANUALS_DIR="/opt/osmo-gsm-manuals" \ -e PARALLEL_MAKE="$PARALLEL_MAKE" \ -e WITH_MANUALS="1" \ -w /build -i -u build \ @@ -247,7 +247,7 @@ (INSTR == "--with-neon-vfpv4" && WITH_MANUALS == "0" && label == "rpi4-deb9build-ansible") cmd: | export ASCIIDOC_WARNINGS_CHECK=1 - export OSMO_GSM_MANUALS_DIR="$PWD/deps/osmo-gsm-manuals" + export OSMO_GSM_MANUALS_DIR="$HOME/osmo-gsm-manuals" {timeout_cmd} ./contrib/jenkins.sh - osmocom-bb diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index c648a7b..4b0f621 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -33,7 +33,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 OSMO_GSM_MANUALS_DIR="/opt/osmo-gsm-manuals" \ -e PARALLEL_MAKE="$PARALLEL_MAKE" \ -e PUBLISH="1" \ -e WITH_MANUALS="1" \ @@ -197,7 +197,7 @@ concurrent: false cmd: | export ASCIIDOC_WARNINGS_CHECK=1 - export OSMO_GSM_MANUALS_DIR="$PWD/deps/osmo-gsm-manuals" + export OSMO_GSM_MANUALS_DIR="$HOME/osmo-gsm-manuals" export PUBLISH=1 ./contrib/jenkins_bts_model.sh "$BTS_MODEL" @@ -213,7 +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 OSMO_GSM_MANUALS_DIR="/opt/osmo-gsm-manuals" \ -e PARALLEL_MAKE="$PARALLEL_MAKE" \ -e PUBLISH="1" \ -e WITH_MANUALS="1" \ @@ -236,7 +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 OSMO_GSM_MANUALS_DIR="/opt/osmo-gsm-manuals" \ -e PARALLEL_MAKE="$PARALLEL_MAKE" \ -e PUBLISH="1" \ -e WITH_MANUALS="1" \ @@ -361,7 +361,7 @@ (INSTR == "--with-neon-vfpv4" && WITH_MANUALS == "0" && label == "rpi4-deb9build-ansible") cmd: | export ASCIIDOC_WARNINGS_CHECK=1 - export OSMO_GSM_MANUALS_DIR="$PWD/deps/osmo-gsm-manuals" + export OSMO_GSM_MANUALS_DIR="$HOME/osmo-gsm-manuals" export PUBLISH=1 ./contrib/jenkins.sh |