<p>osmith has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/12136">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gerrit-verifications/master-builds: fix errors<br><br>Fix three errors that prevented Jenkins from accepting the new<br>configs from Ie0643b17a6be6e86e281b50d78dd7a6858cf99ee<br>("gerrit-verifications/master-builds: WITH_MANUALS"):<br><br>* master-builds: fourth axis needs to be in the template or else the<br>  server will throw a 500 error. gerrit-verifications already has four<br>  template axes.<br>* gerrit-verifications/osmo-pcu: || at the end of combination_filter<br>* gerrit-verifications/osmo-sip-connector: missing ":"<br><br>Change-Id: I4ad63a3167e59b0837ffd1576fb7c7cf2958ff32<br>---<br>M jobs/gerrit-verifications.yml<br>M jobs/master-builds.yml<br>2 files changed, 8 insertions(+), 2 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/36/12136/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml</span><br><span>index 83f1c30..d17934d 100644</span><br><span>--- a/jobs/gerrit-verifications.yml</span><br><span>+++ b/jobs/gerrit-verifications.yml</span><br><span>@@ -204,7 +204,7 @@</span><br><span>             (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="master" && WITH_MANUALS == "0") ||</span><br><span>             (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="v2017.01" && WITH_MANUALS == "0") ||</span><br><span>             (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="origin/nrw/litecell15" && WITH_MANUALS == "0") ||</span><br><span style="color: hsl(0, 100%, 40%);">-            (with_vty == "False" && with_dsp == "none" && FIRMWARE_VERSION=="master" && WITH_MANUALS == "1") ||</span><br><span style="color: hsl(120, 100%, 40%);">+            (with_vty == "False" && with_dsp == "none" && FIRMWARE_VERSION=="master" && WITH_MANUALS == "1")</span><br><span> </span><br><span>       - osmo-python-tests:</span><br><span>           repos_url: 'ssh://jenkins@gerrit.osmocom.org:29418/python/{repos}'</span><br><span>@@ -233,7 +233,7 @@</span><br><span>               -v "$PWD:/build" -v "$HOME/bin:/build_bin" \</span><br><span>               osmocom:amd64 /build/contrib/jenkins.sh</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-      - osmo-sip-connector</span><br><span style="color: hsl(120, 100%, 40%);">+      - osmo-sip-connector:</span><br><span>           cmd: WITH_MANUALS=1 ./contrib/jenkins.sh</span><br><span> </span><br><span>       - osmo-trx:</span><br><span>diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml</span><br><span>index 4988062..1b7cdfd 100644</span><br><span>--- a/jobs/master-builds.yml</span><br><span>+++ b/jobs/master-builds.yml</span><br><span>@@ -14,6 +14,8 @@</span><br><span>     a2: !!python/tuple [default]</span><br><span>     a3_name: a3</span><br><span>     a3: !!python/tuple [default]</span><br><span style="color: hsl(120, 100%, 40%);">+    a4_name: a4</span><br><span style="color: hsl(120, 100%, 40%);">+    a4: !!python/tuple [default]</span><br><span>     combination_filter: ''</span><br><span>     sequential: false</span><br><span>     # most common build invocation (PUBLISH=1 is prepended to publish manual PDFs)</span><br><span>@@ -408,6 +410,10 @@</span><br><span>           type: user-defined</span><br><span>           name: '{obj:a3_name}'</span><br><span>           values: '{obj:a3}'</span><br><span style="color: hsl(120, 100%, 40%);">+      - axis:</span><br><span style="color: hsl(120, 100%, 40%);">+          type: user-defined</span><br><span style="color: hsl(120, 100%, 40%);">+          name: '{obj:a4_name}'</span><br><span style="color: hsl(120, 100%, 40%);">+          values: '{obj:a4}'</span><br><span> </span><br><span>     scm:</span><br><span>       - git:</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12136">change 12136</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/12136"/><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: I4ad63a3167e59b0837ffd1576fb7c7cf2958ff32 </div>
<div style="display:none"> Gerrit-Change-Number: 12136 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>