<p>osmith has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/12089">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">master-builds: use PUBLISH=1 instead of --publish<br><br>Pass all inputs to contrib/jenkins.sh as environment variables instead<br>of mixing with commandline arguments. We decided on this method instead<br>of I3cc01dbc57213b6d6cdc9b394a516510d045f1ae ("use jenkins.sh<br>--publish"), to make the contrib/jenkins.sh scripts less confusing.<br><br>Related: OS#3385<br>Change-Id: Ifc88af086368ce8eea1ea3a375ba7d5603a5d7e5<br>---<br>M jobs/master-builds.yml<br>1 file changed, 16 insertions(+), 12 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/89/12089/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml</span><br><span>index d251ef0..cb6220b 100644</span><br><span>--- a/jobs/master-builds.yml</span><br><span>+++ b/jobs/master-builds.yml</span><br><span>@@ -16,7 +16,7 @@</span><br><span> a3: !!python/tuple [default]</span><br><span> combination_filter: ''</span><br><span> sequential: false</span><br><span style="color: hsl(0, 100%, 40%);">- # most common build invocation (--publish is added to publish manual PDFs)</span><br><span style="color: hsl(120, 100%, 40%);">+ # most common build invocation (PUBLISH=1 is prepended to publish manual PDFs)</span><br><span> cmd: ./contrib/jenkins.sh</span><br><span> wrappers: []</span><br><span> trigger:</span><br><span>@@ -82,7 +82,7 @@</span><br><span> master-osmo-iuh,</span><br><span> master-osmo-msc,</span><br><span> master-osmo-sgsn</span><br><span style="color: hsl(0, 100%, 40%);">- cmd: ./contrib/jenkins.sh --publish</span><br><span style="color: hsl(120, 100%, 40%);">+ cmd: PUBLISH=1 ./contrib/jenkins.sh</span><br><span> </span><br><span> - libosmocore:</span><br><span> a1_name: arch</span><br><span>@@ -173,10 +173,11 @@</span><br><span> -e PARALLEL_MAKE="$PARALLEL_MAKE" \</span><br><span> -e PATH="$PATH:/build_bin" \</span><br><span> -e OSMOPY_DEBUG_TCP_SOCKETS="1" \</span><br><span style="color: hsl(120, 100%, 40%);">+ -e PUBLISH="1" \</span><br><span> -w /build -i -u build \</span><br><span> -v "$PWD:/build" -v "$HOME/bin:/build_bin" \</span><br><span> -v "$HOME/.ssh:/home/build/.ssh:ro" \</span><br><span style="color: hsl(0, 100%, 40%);">- osmocom:amd64 /build/contrib/jenkins.sh --publish</span><br><span style="color: hsl(120, 100%, 40%);">+ osmocom:amd64 /build/contrib/jenkins.sh</span><br><span> </span><br><span> - osmo-bts:</span><br><span> a1_name: FIRMWARE_VERSION</span><br><span>@@ -192,12 +193,12 @@</span><br><span> (FIRMWARE_VERSION == "superfemto_v5.1" && BTS_MODEL == "sysmo") ||</span><br><span> (FIRMWARE_VERSION == "v2017.01" && BTS_MODEL == "lc15") ||</span><br><span> (FIRMWARE_VERSION == "origin/nrw/litecell15" && BTS_MODEL == "lc15")</span><br><span style="color: hsl(0, 100%, 40%);">- cmd: './contrib/jenkins_bts_model.sh "$BTS_MODEL" --publish'</span><br><span style="color: hsl(120, 100%, 40%);">+ cmd: 'PUBLISH=1 ./contrib/jenkins_bts_model.sh "$BTS_MODEL"'</span><br><span> </span><br><span> - osmo-ggsn:</span><br><span> a1_name: GTP</span><br><span> a1: !!python/tuple [--enable-gtp-linux,--disable-gtp-linux]</span><br><span style="color: hsl(0, 100%, 40%);">- cmd: ./contrib/jenkins.sh --publish</span><br><span style="color: hsl(120, 100%, 40%);">+ cmd: PUBLISH=1 ./contrib/jenkins.sh</span><br><span> trigger: master-osmo-sgsn</span><br><span> </span><br><span> - osmo-gmr:</span><br><span>@@ -210,7 +211,7 @@</span><br><span> ./contrib/jenkins.sh</span><br><span> </span><br><span> - osmo-hlr:</span><br><span style="color: hsl(0, 100%, 40%);">- cmd: ./contrib/jenkins.sh --publish</span><br><span style="color: hsl(120, 100%, 40%);">+ cmd: PUBLISH=1 ./contrib/jenkins.sh</span><br><span> </span><br><span> - osmo-iuh:</span><br><span> # Full triggers would be:</span><br><span>@@ -231,10 +232,11 @@</span><br><span> -e PARALLEL_MAKE="$PARALLEL_MAKE" \</span><br><span> -e PATH="$PATH:/build_bin" \</span><br><span> -e OSMOPY_DEBUG_TCP_SOCKETS="1" \</span><br><span style="color: hsl(120, 100%, 40%);">+ -e PUBLISH="1" \</span><br><span> -w /build -i -u build \</span><br><span> -v "$PWD:/build" -v "$HOME/bin:/build_bin" \</span><br><span> -v "$HOME/.ssh:/home/build/.ssh:ro" \</span><br><span style="color: hsl(0, 100%, 40%);">- osmocom:amd64 /build/contrib/jenkins.sh --publish</span><br><span style="color: hsl(120, 100%, 40%);">+ osmocom:amd64 /build/contrib/jenkins.sh</span><br><span> trigger: master-osmo-msc, master-osmo-bsc</span><br><span> </span><br><span> - osmo-msc:</span><br><span>@@ -254,11 +256,12 @@</span><br><span> -e IU="$IU" \</span><br><span> -e PATH="$PATH:/build_bin" \</span><br><span> -e OSMOPY_DEBUG_TCP_SOCKETS="1" \</span><br><span style="color: hsl(120, 100%, 40%);">+ -e PUBLISH="1" \</span><br><span> -w /build -u build \</span><br><span> -v "$PWD:/build" -v "$HOME/bin:/build_bin" \</span><br><span> -v "$ARTIFACT_STORE:/artifact_store" \</span><br><span> -v "$HOME/.ssh:/home/build/.ssh:ro" \</span><br><span style="color: hsl(0, 100%, 40%);">- osmocom:amd64 /build/contrib/jenkins.sh --publish</span><br><span style="color: hsl(120, 100%, 40%);">+ osmocom:amd64 /build/contrib/jenkins.sh</span><br><span> </span><br><span> - osmo-pcap</span><br><span> </span><br><span>@@ -281,7 +284,7 @@</span><br><span> (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="v2017.01") ||</span><br><span> (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="origin/nrw/litecell15") ||</span><br><span> (with_vty == "False" && with_dsp == "none" && FIRMWARE_VERSION=="master")</span><br><span style="color: hsl(0, 100%, 40%);">- cmd: ./contrib/jenkins.sh --publish</span><br><span style="color: hsl(120, 100%, 40%);">+ cmd: PUBLISH=1 ./contrib/jenkins.sh</span><br><span> </span><br><span> - osmo-sgsn:</span><br><span> a1_name: IU</span><br><span>@@ -296,14 +299,15 @@</span><br><span> -e IU="$IU" \</span><br><span> -e PATH="$PATH:/build_bin" \</span><br><span> -e OSMOPY_DEBUG_TCP_SOCKETS="1" \</span><br><span style="color: hsl(120, 100%, 40%);">+ -e PUBLISH="1" \</span><br><span> -w /build -i -u build \</span><br><span> -v "$PWD:/build" -v "$HOME/bin:/build_bin" \</span><br><span> -v "$HOME/.ssh:/home/build/.ssh:ro" \</span><br><span style="color: hsl(0, 100%, 40%);">- osmocom:amd64 /build/contrib/jenkins.sh --publish</span><br><span style="color: hsl(120, 100%, 40%);">+ osmocom:amd64 /build/contrib/jenkins.sh</span><br><span> </span><br><span> - osmo-sip-connector:</span><br><span> email: gerrit-log@lists.osmocom.org laforge@gnumonks.org holger@freyther.de</span><br><span style="color: hsl(0, 100%, 40%);">- cmd: ./contrib/jenkins.sh --publish</span><br><span style="color: hsl(120, 100%, 40%);">+ cmd: PUBLISH=1 ./contrib/jenkins.sh</span><br><span> </span><br><span> - osmo-tetra:</span><br><span> email: gerrit-log@lists.osmocom.org laforge@gnumonks.org 246tnt@gmail.com</span><br><span>@@ -314,7 +318,7 @@</span><br><span> # a1: !!python/tuple [--with-sse, --with-neon, --with-neon-vfpv4]</span><br><span> a1: !!python/tuple [--with-sse]</span><br><span> concurrent: true</span><br><span style="color: hsl(0, 100%, 40%);">- cmd: ./contrib/jenkins.sh --publish</span><br><span style="color: hsl(120, 100%, 40%);">+ cmd: PUBLISH=1 ./contrib/jenkins.sh</span><br><span> </span><br><span> - osmocom-bb</span><br><span> - osmo-sysmon</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12089">change 12089</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/12089"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-ci </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Ifc88af086368ce8eea1ea3a375ba7d5603a5d7e5 </div>
<div style="display:none"> Gerrit-Change-Number: 12089 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>