<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ci/+/17261">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  osmith: Looks good to me, approved
  pespin: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">job: Update master and gerrit osmo-bts jobs to also build on ARM platform<br><br>Related: OS#4301<br>Change-Id: I72e228ff1a126f6c41c5fd6a530de85e177a0d21<br>---<br>M jobs/gerrit-verifications.yml<br>M jobs/master-builds.yml<br>2 files changed, 23 insertions(+), 19 deletions(-)<br><br></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 e946674..15f8b5a 100644</span><br><span>--- a/jobs/gerrit-verifications.yml</span><br><span>+++ b/jobs/gerrit-verifications.yml</span><br><span>@@ -90,6 +90,7 @@</span><br><span>       - osmo-bsc</span><br><span> </span><br><span>       - osmo-bts:</span><br><span style="color: hsl(120, 100%, 40%);">+          slave_axis: !!python/tuple [osmocom-master-debian9, rpi4-deb9build-ansible]</span><br><span>           a1_name: FIRMWARE_VERSION</span><br><span>           a1: !!python/tuple [master, femtobts_v2.7, superfemto_v2.4, superfemto_v3.0.1pre, superfemto_v3.1, superfemto_v5.1, v2017.01, litecell15, oc2g, oc2g-next]</span><br><span>           a2_name: BTS_MODEL</span><br><span>@@ -97,16 +98,17 @@</span><br><span>           a3_name: WITH_MANUALS</span><br><span>           a3: !!python/tuple ["1", "0"]</span><br><span>           combination_filter: ></span><br><span style="color: hsl(0, 100%, 40%);">-            (FIRMWARE_VERSION == "master" && WITH_MANUALS == "0") ||</span><br><span style="color: hsl(0, 100%, 40%);">-            (FIRMWARE_VERSION == "femtobts_v2.7" && BTS_MODEL == "sysmo" && WITH_MANUALS == "1") ||</span><br><span style="color: hsl(0, 100%, 40%);">-            (FIRMWARE_VERSION == "superfemto_v2.4" && BTS_MODEL == "sysmo" && WITH_MANUALS == "0") ||</span><br><span style="color: hsl(0, 100%, 40%);">-            (FIRMWARE_VERSION == "superfemto_v3.0.1pre" && BTS_MODEL == "sysmo" && WITH_MANUALS == "0") ||</span><br><span style="color: hsl(0, 100%, 40%);">-            (FIRMWARE_VERSION == "superfemto_v3.1" && BTS_MODEL == "sysmo" && WITH_MANUALS == "0") ||</span><br><span style="color: hsl(0, 100%, 40%);">-            (FIRMWARE_VERSION == "superfemto_v5.1" && BTS_MODEL == "sysmo" && WITH_MANUALS == "0") ||</span><br><span style="color: hsl(0, 100%, 40%);">-            (FIRMWARE_VERSION == "v2017.01" && BTS_MODEL == "lc15" && WITH_MANUALS == "0") ||</span><br><span style="color: hsl(0, 100%, 40%);">-            (FIRMWARE_VERSION == "litecell15" && BTS_MODEL == "lc15" && WITH_MANUALS == "0") ||</span><br><span style="color: hsl(0, 100%, 40%);">-            (FIRMWARE_VERSION == "oc2g" && BTS_MODEL == "oc2g" && WITH_MANUALS == "0") ||</span><br><span style="color: hsl(0, 100%, 40%);">-            (FIRMWARE_VERSION == "oc2g-next" && BTS_MODEL == "oc2g" && WITH_MANUALS == "0")</span><br><span style="color: hsl(120, 100%, 40%);">+            (FIRMWARE_VERSION == "master" && WITH_MANUALS == "0" && label == "osmocom-master-debian9") ||</span><br><span style="color: hsl(120, 100%, 40%);">+            (FIRMWARE_VERSION == "master" && BTS_MODEL == "trx" && WITH_MANUALS == "0" && label == "rpi4-deb9build-ansible") ||</span><br><span style="color: hsl(120, 100%, 40%);">+            (FIRMWARE_VERSION == "femtobts_v2.7" && BTS_MODEL == "sysmo" && WITH_MANUALS == "1" && label == "osmocom-master-debian9") ||</span><br><span style="color: hsl(120, 100%, 40%);">+            (FIRMWARE_VERSION == "superfemto_v2.4" && BTS_MODEL == "sysmo" && WITH_MANUALS == "0" && label == "osmocom-master-debian9") ||</span><br><span style="color: hsl(120, 100%, 40%);">+            (FIRMWARE_VERSION == "superfemto_v3.0.1pre" && BTS_MODEL == "sysmo" && WITH_MANUALS == "0" && label == "osmocom-master-debian9") ||</span><br><span style="color: hsl(120, 100%, 40%);">+            (FIRMWARE_VERSION == "superfemto_v3.1" && BTS_MODEL == "sysmo" && WITH_MANUALS == "0" && label == "osmocom-master-debian9") ||</span><br><span style="color: hsl(120, 100%, 40%);">+            (FIRMWARE_VERSION == "superfemto_v5.1" && BTS_MODEL == "sysmo" && WITH_MANUALS == "0" && label == "osmocom-master-debian9") ||</span><br><span style="color: hsl(120, 100%, 40%);">+            (FIRMWARE_VERSION == "v2017.01" && BTS_MODEL == "lc15" && WITH_MANUALS == "0" && label == "osmocom-master-debian9") ||</span><br><span style="color: hsl(120, 100%, 40%);">+            (FIRMWARE_VERSION == "litecell15" && BTS_MODEL == "lc15" && WITH_MANUALS == "0" && label == "osmocom-master-debian9") ||</span><br><span style="color: hsl(120, 100%, 40%);">+            (FIRMWARE_VERSION == "oc2g" && BTS_MODEL == "oc2g" && WITH_MANUALS == "0" && label == "osmocom-master-debian9") ||</span><br><span style="color: hsl(120, 100%, 40%);">+            (FIRMWARE_VERSION == "oc2g-next" && BTS_MODEL == "oc2g" && WITH_MANUALS == "0" && label == "osmocom-master-debian9")</span><br><span>           concurrent: false</span><br><span>           cmd: 'ASCIIDOC_WARNINGS_CHECK="1" ./contrib/jenkins_bts_model.sh "$BTS_MODEL"'</span><br><span> </span><br><span>diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml</span><br><span>index 688ee15..1e15e9d 100644</span><br><span>--- a/jobs/master-builds.yml</span><br><span>+++ b/jobs/master-builds.yml</span><br><span>@@ -176,6 +176,7 @@</span><br><span>       - osmo-bsc</span><br><span> </span><br><span>       - osmo-bts:</span><br><span style="color: hsl(120, 100%, 40%);">+          slave_axis: !!python/tuple [osmocom-master-debian9, rpi4-deb9build-ansible]</span><br><span>           a1_name: FIRMWARE_VERSION</span><br><span>           a1: !!python/tuple [master, femtobts_v2.7, superfemto_v2.4, superfemto_v3.0.1pre, superfemto_v3.1, superfemto_v5.1, v2017.01, origin/nrw/litecell15, origin/nrw/oc2g]</span><br><span>           a2_name: BTS_MODEL</span><br><span>@@ -183,15 +184,16 @@</span><br><span>           a3_name: WITH_MANUALS</span><br><span>           a3: !!python/tuple ["1", "0"]</span><br><span>           combination_filter: ></span><br><span style="color: hsl(0, 100%, 40%);">-            (FIRMWARE_VERSION == "master" && WITH_MANUALS == "0") ||</span><br><span style="color: hsl(0, 100%, 40%);">-            (FIRMWARE_VERSION == "femtobts_v2.7" && BTS_MODEL == "sysmo" && WITH_MANUALS == "1") ||</span><br><span style="color: hsl(0, 100%, 40%);">-            (FIRMWARE_VERSION == "superfemto_v2.4" && BTS_MODEL == "sysmo" && WITH_MANUALS == "0") ||</span><br><span style="color: hsl(0, 100%, 40%);">-            (FIRMWARE_VERSION == "superfemto_v3.0.1pre" && BTS_MODEL == "sysmo" && WITH_MANUALS == "0") ||</span><br><span style="color: hsl(0, 100%, 40%);">-            (FIRMWARE_VERSION == "superfemto_v3.1" && BTS_MODEL == "sysmo" && WITH_MANUALS == "0") ||</span><br><span style="color: hsl(0, 100%, 40%);">-            (FIRMWARE_VERSION == "superfemto_v5.1" && BTS_MODEL == "sysmo" && WITH_MANUALS == "0") ||</span><br><span style="color: hsl(0, 100%, 40%);">-            (FIRMWARE_VERSION == "v2017.01" && BTS_MODEL == "lc15" && WITH_MANUALS == "0") ||</span><br><span style="color: hsl(0, 100%, 40%);">-            (FIRMWARE_VERSION == "origin/nrw/litecell15" && BTS_MODEL == "lc15" && WITH_MANUALS == "0") ||</span><br><span style="color: hsl(0, 100%, 40%);">-            (FIRMWARE_VERSION == "origin/nrw/oc2g" && BTS_MODEL == "oc2g" && WITH_MANUALS == "0")</span><br><span style="color: hsl(120, 100%, 40%);">+            (FIRMWARE_VERSION == "master" && WITH_MANUALS == "0" && label == "osmocom-master-debian9") ||</span><br><span style="color: hsl(120, 100%, 40%);">+            (FIRMWARE_VERSION == "master" && BTS_MODEL == "trx" && WITH_MANUALS == "0" && label == "rpi4-deb9build-ansible") ||</span><br><span style="color: hsl(120, 100%, 40%);">+            (FIRMWARE_VERSION == "femtobts_v2.7" && BTS_MODEL == "sysmo" && WITH_MANUALS == "1" && label == "osmocom-master-debian9") ||</span><br><span style="color: hsl(120, 100%, 40%);">+            (FIRMWARE_VERSION == "superfemto_v2.4" && BTS_MODEL == "sysmo" && WITH_MANUALS == "0" && label == "osmocom-master-debian9") ||</span><br><span style="color: hsl(120, 100%, 40%);">+            (FIRMWARE_VERSION == "superfemto_v3.0.1pre" && BTS_MODEL == "sysmo" && WITH_MANUALS == "0" && label == "osmocom-master-debian9") ||</span><br><span style="color: hsl(120, 100%, 40%);">+            (FIRMWARE_VERSION == "superfemto_v3.1" && BTS_MODEL == "sysmo" && WITH_MANUALS == "0" && label == "osmocom-master-debian9") ||</span><br><span style="color: hsl(120, 100%, 40%);">+            (FIRMWARE_VERSION == "superfemto_v5.1" && BTS_MODEL == "sysmo" && WITH_MANUALS == "0" && label == "osmocom-master-debian9") ||</span><br><span style="color: hsl(120, 100%, 40%);">+            (FIRMWARE_VERSION == "v2017.01" && BTS_MODEL == "lc15" && WITH_MANUALS == "0" && label == "osmocom-master-debian9") ||</span><br><span style="color: hsl(120, 100%, 40%);">+            (FIRMWARE_VERSION == "origin/nrw/litecell15" && BTS_MODEL == "lc15" && WITH_MANUALS == "0" && label == "osmocom-master-debian9") ||</span><br><span style="color: hsl(120, 100%, 40%);">+            (FIRMWARE_VERSION == "origin/nrw/oc2g" && BTS_MODEL == "oc2g" && WITH_MANUALS == "0" && label == "osmocom-master-debian9")</span><br><span>           concurrent: false</span><br><span>           cmd: 'PUBLISH=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins_bts_model.sh "$BTS_MODEL"'</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ci/+/17261">change 17261</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/c/osmo-ci/+/17261"/><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-Change-Id: I72e228ff1a126f6c41c5fd6a530de85e177a0d21 </div>
<div style="display:none"> Gerrit-Change-Number: 17261 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>