Change in osmo-ci[master]: job: Update master and gerrit osmo-pcu jobs to also build on ARM plat...

[laforge]

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/17284 )

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

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

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

Approvals:
  laforge: Looks good to me, approved
  pespin: Verified



diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml
index 15f8b5a..18df857 100644
--- a/jobs/gerrit-verifications.yml
+++ b/jobs/gerrit-verifications.yml
@@ -159,6 +159,7 @@
       - osmo-pcap
 
       - osmo-pcu:
+          slave_axis: !!python/tuple [osmocom-master-debian9, rpi4-deb9build-ansible]
           a1_name: FIRMWARE_VERSION
           a1: !!python/tuple [master, v2017.01, litecell15, oc2g]
           a2_name: with_vty
@@ -168,12 +169,13 @@
           a4_name: WITH_MANUALS
           a4: !!python/tuple ["1", "0"]
           combination_filter: >
-            (with_vty == "True" && with_dsp == "sysmo" && FIRMWARE_VERSION=="master" && WITH_MANUALS == "0") ||
-            (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="master" && WITH_MANUALS == "0") ||
-            (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="v2017.01" && WITH_MANUALS == "0") ||
-            (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="litecell15" && WITH_MANUALS == "0") ||
-            (with_vty == "True" && with_dsp == "oc2g" && FIRMWARE_VERSION=="oc2g" && WITH_MANUALS == "0") ||
-            (with_vty == "False" && with_dsp == "none" && FIRMWARE_VERSION=="master" && WITH_MANUALS == "1")
+            (with_vty == "True" && with_dsp == "sysmo" && FIRMWARE_VERSION=="master" && WITH_MANUALS == "0" && label == "osmocom-master-debian9") ||
+            (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="master" && WITH_MANUALS == "0" && label == "osmocom-master-debian9") ||
+            (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="v2017.01" && WITH_MANUALS == "0" && label == "osmocom-master-debian9") ||
+            (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="litecell15" && WITH_MANUALS == "0" && label == "osmocom-master-debian9") ||
+            (with_vty == "True" && with_dsp == "oc2g" && FIRMWARE_VERSION=="oc2g" && WITH_MANUALS == "0" && label == "osmocom-master-debian9") ||
+            (with_vty == "False" && with_dsp == "none" && FIRMWARE_VERSION=="master" && WITH_MANUALS == "1" && label == "osmocom-master-debian9") ||
+            (with_vty == "False" && with_dsp == "none" && FIRMWARE_VERSION=="master" && WITH_MANUALS == "0" && label == "rpi4-deb9build-ansible")
           cmd: |
             {docker_run} \
               -e FIRMWARE_VERSION="$FIRMWARE_VERSION" \
diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml
index d10ee18..c4226ac 100644
--- a/jobs/master-builds.yml
+++ b/jobs/master-builds.yml
@@ -253,6 +253,7 @@
       - osmo-pcap
 
       - osmo-pcu:
+          slave_axis: !!python/tuple [osmocom-master-debian9, rpi4-deb9build-ansible]
           a1_name: FIRMWARE_VERSION
           a1: !!python/tuple [master, v2017.01, origin/nrw/litecell15]
           a2_name: with_vty
@@ -262,11 +263,12 @@
           a4_name: WITH_MANUALS
           a4: !!python/tuple ["1", "0"]
           combination_filter: >
-            (with_vty == "True" && with_dsp == "sysmo" && FIRMWARE_VERSION=="master" && WITH_MANUALS == "0") ||
-            (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="master" && WITH_MANUALS == "0") ||
-            (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="v2017.01" && WITH_MANUALS == "0") ||
-            (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="origin/nrw/litecell15" && WITH_MANUALS == "0") ||
-            (with_vty == "False" && with_dsp == "none" && FIRMWARE_VERSION=="master" && WITH_MANUALS == "1")
+            (with_vty == "True" && with_dsp == "sysmo" && FIRMWARE_VERSION=="master" && WITH_MANUALS == "0" && label == "osmocom-master-debian9") ||
+            (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="master" && WITH_MANUALS == "0" && label == "osmocom-master-debian9") ||
+            (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="v2017.01" && WITH_MANUALS == "0" && label == "osmocom-master-debian9") ||
+            (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="origin/nrw/litecell15" && WITH_MANUALS == "0" && label == "osmocom-master-debian9") ||
+            (with_vty == "False" && with_dsp == "none" && FIRMWARE_VERSION=="master" && WITH_MANUALS == "1" && label == "osmocom-master-debian9") ||
+            (with_vty == "False" && with_dsp == "none" && FIRMWARE_VERSION=="master" && WITH_MANUALS == "0" && label == "rpi4-deb9build-ansible")
           cmd: |
             {docker_run} \
               -e FIRMWARE_VERSION="$FIRMWARE_VERSION" \

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

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I8109cc9a71e6c14304ed6463f9b073ef3f4f3c2a
Gerrit-Change-Number: 17284
Gerrit-PatchSet: 3
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200316/155f22de/attachment.htm>