pespin has uploaded this change for review. ( 
https://gerrit.osmocom.org/c/osmo-ci/+/17261 )


Change subject: job: Update master and gerrit osmo-bts jobs to also build on 
ARM platform
......................................................................

job: Update master and gerrit osmo-bts jobs to also build on ARM platform

Related: OS#4301
Change-Id: I72e228ff1a126f6c41c5fd6a530de85e177a0d21
---
M jobs/gerrit-verifications.yml
M jobs/master-builds.yml
2 files changed, 23 insertions(+), 19 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/61/17261/1

diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml
index e946674..15f8b5a 100644
--- a/jobs/gerrit-verifications.yml
+++ b/jobs/gerrit-verifications.yml
@@ -90,6 +90,7 @@
       - osmo-bsc

       - osmo-bts:
+          slave_axis: !!python/tuple [osmocom-master-debian9, 
rpi4-deb9build-ansible]
           a1_name: FIRMWARE_VERSION
           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]
           a2_name: BTS_MODEL
@@ -97,16 +98,17 @@
           a3_name: WITH_MANUALS
           a3: !!python/tuple ["1", "0"]
           combination_filter: >
-            (FIRMWARE_VERSION == "master" && WITH_MANUALS == "0") ||
-            (FIRMWARE_VERSION == "femtobts_v2.7" && BTS_MODEL == "sysmo" && 
WITH_MANUALS == "1") ||
-            (FIRMWARE_VERSION == "superfemto_v2.4" && BTS_MODEL == "sysmo" && 
WITH_MANUALS == "0") ||
-            (FIRMWARE_VERSION == "superfemto_v3.0.1pre" && BTS_MODEL == 
"sysmo" && WITH_MANUALS == "0") ||
-            (FIRMWARE_VERSION == "superfemto_v3.1" && BTS_MODEL == "sysmo" && 
WITH_MANUALS == "0") ||
-            (FIRMWARE_VERSION == "superfemto_v5.1" && BTS_MODEL == "sysmo" && 
WITH_MANUALS == "0") ||
-            (FIRMWARE_VERSION == "v2017.01" && BTS_MODEL == "lc15" && 
WITH_MANUALS == "0") ||
-            (FIRMWARE_VERSION == "litecell15" && BTS_MODEL == "lc15" && 
WITH_MANUALS == "0") ||
-            (FIRMWARE_VERSION == "oc2g" && BTS_MODEL == "oc2g" && WITH_MANUALS 
== "0") ||
-            (FIRMWARE_VERSION == "oc2g-next" && BTS_MODEL == "oc2g" && 
WITH_MANUALS == "0")
+            (FIRMWARE_VERSION == "master" && WITH_MANUALS == "0" && label == 
"osmocom-master-debian9") ||
+            (FIRMWARE_VERSION == "master" && BTS_MODEL == "trx" && 
WITH_MANUALS == "0" && label == "rpi4-deb9build-ansible") ||
+            (FIRMWARE_VERSION == "femtobts_v2.7" && BTS_MODEL == "sysmo" && 
WITH_MANUALS == "1" && label == "osmocom-master-debian9") ||
+            (FIRMWARE_VERSION == "superfemto_v2.4" && BTS_MODEL == "sysmo" && 
WITH_MANUALS == "0" && label == "osmocom-master-debian9") ||
+            (FIRMWARE_VERSION == "superfemto_v3.0.1pre" && BTS_MODEL == 
"sysmo" && WITH_MANUALS == "0" && label == "osmocom-master-debian9") ||
+            (FIRMWARE_VERSION == "superfemto_v3.1" && BTS_MODEL == "sysmo" && 
WITH_MANUALS == "0" && label == "osmocom-master-debian9") ||
+            (FIRMWARE_VERSION == "superfemto_v5.1" && BTS_MODEL == "sysmo" && 
WITH_MANUALS == "0" && label == "osmocom-master-debian9") ||
+            (FIRMWARE_VERSION == "v2017.01" && BTS_MODEL == "lc15" && 
WITH_MANUALS == "0" && label == "osmocom-master-debian9") ||
+            (FIRMWARE_VERSION == "litecell15" && BTS_MODEL == "lc15" && 
WITH_MANUALS == "0" && label == "osmocom-master-debian9") ||
+            (FIRMWARE_VERSION == "oc2g" && BTS_MODEL == "oc2g" && WITH_MANUALS 
== "0" && label == "osmocom-master-debian9") ||
+            (FIRMWARE_VERSION == "oc2g-next" && BTS_MODEL == "oc2g" && 
WITH_MANUALS == "0" && label == "osmocom-master-debian9")
           concurrent: false
           cmd: 'ASCIIDOC_WARNINGS_CHECK="1" ./contrib/jenkins_bts_model.sh 
"$BTS_MODEL"'

diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml
index 688ee15..1e15e9d 100644
--- a/jobs/master-builds.yml
+++ b/jobs/master-builds.yml
@@ -176,6 +176,7 @@
       - osmo-bsc

       - osmo-bts:
+          slave_axis: !!python/tuple [osmocom-master-debian9, 
rpi4-deb9build-ansible]
           a1_name: FIRMWARE_VERSION
           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]
           a2_name: BTS_MODEL
@@ -183,15 +184,16 @@
           a3_name: WITH_MANUALS
           a3: !!python/tuple ["1", "0"]
           combination_filter: >
-            (FIRMWARE_VERSION == "master" && WITH_MANUALS == "0") ||
-            (FIRMWARE_VERSION == "femtobts_v2.7" && BTS_MODEL == "sysmo" && 
WITH_MANUALS == "1") ||
-            (FIRMWARE_VERSION == "superfemto_v2.4" && BTS_MODEL == "sysmo" && 
WITH_MANUALS == "0") ||
-            (FIRMWARE_VERSION == "superfemto_v3.0.1pre" && BTS_MODEL == 
"sysmo" && WITH_MANUALS == "0") ||
-            (FIRMWARE_VERSION == "superfemto_v3.1" && BTS_MODEL == "sysmo" && 
WITH_MANUALS == "0") ||
-            (FIRMWARE_VERSION == "superfemto_v5.1" && BTS_MODEL == "sysmo" && 
WITH_MANUALS == "0") ||
-            (FIRMWARE_VERSION == "v2017.01" && BTS_MODEL == "lc15" && 
WITH_MANUALS == "0") ||
-            (FIRMWARE_VERSION == "origin/nrw/litecell15" && BTS_MODEL == 
"lc15" && WITH_MANUALS == "0") ||
-            (FIRMWARE_VERSION == "origin/nrw/oc2g" && BTS_MODEL == "oc2g" && 
WITH_MANUALS == "0")
+            (FIRMWARE_VERSION == "master" && WITH_MANUALS == "0" && label == 
"osmocom-master-debian9") ||
+            (FIRMWARE_VERSION == "master" && BTS_MODEL == "trx" && 
WITH_MANUALS == "0" && label == "rpi4-deb9build-ansible") ||
+            (FIRMWARE_VERSION == "femtobts_v2.7" && BTS_MODEL == "sysmo" && 
WITH_MANUALS == "1" && label == "osmocom-master-debian9") ||
+            (FIRMWARE_VERSION == "superfemto_v2.4" && BTS_MODEL == "sysmo" && 
WITH_MANUALS == "0" && label == "osmocom-master-debian9") ||
+            (FIRMWARE_VERSION == "superfemto_v3.0.1pre" && BTS_MODEL == 
"sysmo" && WITH_MANUALS == "0" && label == "osmocom-master-debian9") ||
+            (FIRMWARE_VERSION == "superfemto_v3.1" && BTS_MODEL == "sysmo" && 
WITH_MANUALS == "0" && label == "osmocom-master-debian9") ||
+            (FIRMWARE_VERSION == "superfemto_v5.1" && BTS_MODEL == "sysmo" && 
WITH_MANUALS == "0" && label == "osmocom-master-debian9") ||
+            (FIRMWARE_VERSION == "v2017.01" && BTS_MODEL == "lc15" && 
WITH_MANUALS == "0" && label == "osmocom-master-debian9") ||
+            (FIRMWARE_VERSION == "origin/nrw/litecell15" && BTS_MODEL == 
"lc15" && WITH_MANUALS == "0" && label == "osmocom-master-debian9") ||
+            (FIRMWARE_VERSION == "origin/nrw/oc2g" && BTS_MODEL == "oc2g" && 
WITH_MANUALS == "0" && label == "osmocom-master-debian9")
           concurrent: false
           cmd: 'PUBLISH=1 ASCIIDOC_WARNINGS_CHECK=1 
./contrib/jenkins_bts_model.sh "$BTS_MODEL"'


--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/17261
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I72e228ff1a126f6c41c5fd6a530de85e177a0d21
Gerrit-Change-Number: 17261
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <[email protected]>
Gerrit-MessageType: newchange

Reply via email to