diff options
| author | Oliver Smith <osmith@sysmocom.de> | 2018-12-04 10:39:33 +0100 |
|---|---|---|
| committer | Oliver Smith <osmith@sysmocom.de> | 2018-12-04 10:39:33 +0100 |
| commit | 6599da6d312b87c1271b2c4ff44d73ef4b4e3976 (patch) | |
| tree | 7be8d3d77a422b5fac377dedec44561a11aa1714 /jobs | |
| parent | bef4e9cb5d8f68d77654ee588b19650e2f175e86 (diff) | |
master-builds: use PUBLISH=1 instead of --publish
Pass all inputs to contrib/jenkins.sh as environment variables instead
of mixing with commandline arguments. We decided on this method instead
of I3cc01dbc57213b6d6cdc9b394a516510d045f1ae ("use jenkins.sh
--publish"), to make the contrib/jenkins.sh scripts less confusing.
Related: OS#3385
Change-Id: Ifc88af086368ce8eea1ea3a375ba7d5603a5d7e5
Diffstat (limited to 'jobs')
| -rw-r--r-- | jobs/master-builds.yml | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index d251ef0..cb6220b 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -16,7 +16,7 @@ a3: !!python/tuple [default] combination_filter: '' sequential: false - # most common build invocation (--publish is added to publish manual PDFs) + # most common build invocation (PUBLISH=1 is prepended to publish manual PDFs) cmd: ./contrib/jenkins.sh wrappers: [] trigger: @@ -82,7 +82,7 @@ master-osmo-iuh, master-osmo-msc, master-osmo-sgsn - cmd: ./contrib/jenkins.sh --publish + cmd: PUBLISH=1 ./contrib/jenkins.sh - libosmocore: a1_name: arch @@ -173,10 +173,11 @@ -e PARALLEL_MAKE="$PARALLEL_MAKE" \ -e PATH="$PATH:/build_bin" \ -e OSMOPY_DEBUG_TCP_SOCKETS="1" \ + -e PUBLISH="1" \ -w /build -i -u build \ -v "$PWD:/build" -v "$HOME/bin:/build_bin" \ -v "$HOME/.ssh:/home/build/.ssh:ro" \ - osmocom:amd64 /build/contrib/jenkins.sh --publish + osmocom:amd64 /build/contrib/jenkins.sh - osmo-bts: a1_name: FIRMWARE_VERSION @@ -192,12 +193,12 @@ (FIRMWARE_VERSION == "superfemto_v5.1" && BTS_MODEL == "sysmo") || (FIRMWARE_VERSION == "v2017.01" && BTS_MODEL == "lc15") || (FIRMWARE_VERSION == "origin/nrw/litecell15" && BTS_MODEL == "lc15") - cmd: './contrib/jenkins_bts_model.sh "$BTS_MODEL" --publish' + cmd: 'PUBLISH=1 ./contrib/jenkins_bts_model.sh "$BTS_MODEL"' - osmo-ggsn: a1_name: GTP a1: !!python/tuple [--enable-gtp-linux,--disable-gtp-linux] - cmd: ./contrib/jenkins.sh --publish + cmd: PUBLISH=1 ./contrib/jenkins.sh trigger: master-osmo-sgsn - osmo-gmr: @@ -210,7 +211,7 @@ ./contrib/jenkins.sh - osmo-hlr: - cmd: ./contrib/jenkins.sh --publish + cmd: PUBLISH=1 ./contrib/jenkins.sh - osmo-iuh: # Full triggers would be: @@ -231,10 +232,11 @@ -e PARALLEL_MAKE="$PARALLEL_MAKE" \ -e PATH="$PATH:/build_bin" \ -e OSMOPY_DEBUG_TCP_SOCKETS="1" \ + -e PUBLISH="1" \ -w /build -i -u build \ -v "$PWD:/build" -v "$HOME/bin:/build_bin" \ -v "$HOME/.ssh:/home/build/.ssh:ro" \ - osmocom:amd64 /build/contrib/jenkins.sh --publish + osmocom:amd64 /build/contrib/jenkins.sh trigger: master-osmo-msc, master-osmo-bsc - osmo-msc: @@ -254,11 +256,12 @@ -e IU="$IU" \ -e PATH="$PATH:/build_bin" \ -e OSMOPY_DEBUG_TCP_SOCKETS="1" \ + -e PUBLISH="1" \ -w /build -u build \ -v "$PWD:/build" -v "$HOME/bin:/build_bin" \ -v "$ARTIFACT_STORE:/artifact_store" \ -v "$HOME/.ssh:/home/build/.ssh:ro" \ - osmocom:amd64 /build/contrib/jenkins.sh --publish + osmocom:amd64 /build/contrib/jenkins.sh - osmo-pcap @@ -281,7 +284,7 @@ (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="v2017.01") || (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="origin/nrw/litecell15") || (with_vty == "False" && with_dsp == "none" && FIRMWARE_VERSION=="master") - cmd: ./contrib/jenkins.sh --publish + cmd: PUBLISH=1 ./contrib/jenkins.sh - osmo-sgsn: a1_name: IU @@ -296,14 +299,15 @@ -e IU="$IU" \ -e PATH="$PATH:/build_bin" \ -e OSMOPY_DEBUG_TCP_SOCKETS="1" \ + -e PUBLISH="1" \ -w /build -i -u build \ -v "$PWD:/build" -v "$HOME/bin:/build_bin" \ -v "$HOME/.ssh:/home/build/.ssh:ro" \ - osmocom:amd64 /build/contrib/jenkins.sh --publish + osmocom:amd64 /build/contrib/jenkins.sh - osmo-sip-connector: email: gerrit-log@lists.osmocom.org laforge@gnumonks.org holger@freyther.de - cmd: ./contrib/jenkins.sh --publish + cmd: PUBLISH=1 ./contrib/jenkins.sh - osmo-tetra: email: gerrit-log@lists.osmocom.org laforge@gnumonks.org 246tnt@gmail.com @@ -314,7 +318,7 @@ # a1: !!python/tuple [--with-sse, --with-neon, --with-neon-vfpv4] a1: !!python/tuple [--with-sse] concurrent: true - cmd: ./contrib/jenkins.sh --publish + cmd: PUBLISH=1 ./contrib/jenkins.sh - osmocom-bb - osmo-sysmon |