[MERGED] osmo-ci[master]: libosmocore: use dispatcher script

[Max]

Max has submitted this change and it was merged.

Change subject: libosmocore: use dispatcher script
......................................................................


libosmocore: use dispatcher script

Get rid of job name comparison because it depends and exact build server
name and hence is highly fragile. Use dispatcher script the same way we
do in osmo-bts.

N. B: this requires I2955e866bce4f000a53369bd601a346c36c82468 in
libosmocore.

Change-Id: I76dfc11a05007ae5c6e0554fe8132695b67cccaa
---
M jobs/gerrit-verifications.yml
M jobs/master-builds.yml
2 files changed, 2 insertions(+), 14 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved; Verified



diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml
index d0df20c..ce9d084 100644
--- a/jobs/gerrit-verifications.yml
+++ b/jobs/gerrit-verifications.yml
@@ -46,13 +46,7 @@
           a1_name: arch
           a1: !!python/tuple [arm-none-eabi, amd64]
           combination_filter: '!(arch=="arm-none-eabi" && label=="FreeBSD_amd64")'
-          cmd: >
-           # keep first line with less indent to preserve newlines
-            if [[ "$JOB_NAME" == *"arch=arm-none-eabi,label=linux_amd64_debian8"* ]]; then
-              ./contrib/jenkins-arm.sh
-            else
-              ./contrib/jenkins.sh
-            fi
+          cmd: './contrib/jenkins_arch.sh "$arch"'
 
       - libsmpp34
       - libusrp
diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml
index ba77514..0f9bb1e 100644
--- a/jobs/master-builds.yml
+++ b/jobs/master-builds.yml
@@ -56,13 +56,7 @@
           a1_name: arch
           a1: !!python/tuple [arm-none-eabi, amd64]
           combination_filter: '!(arch=="arm-none-eabi" && label=="FreeBSD_amd64")'
-          cmd: >
-           # keep first line with less indent to preserve newlines
-            if [[ "$JOB_NAME" == *"arch=arm-none-eabi,label=linux_amd64_debian8"* ]]; then
-              ./contrib/jenkins-arm.sh
-            else
-              ./contrib/jenkins.sh
-            fi
+          cmd: './contrib/jenkins_arch.sh "$arch"'
           trigger: >
             master-libosmo-abis, master-libosmo-sccp, master-openbsc, master-osmo-pcap, master-osmo-tetra,
             master-osmo-pcu, master-osmo-gmr, master-osmo-bts, master-osmocom-bb, SIMtrace, xgoldmon,

-- 
To view, visit https://gerrit.osmocom.org/5885
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I76dfc11a05007ae5c6e0554fe8132695b67cccaa
Gerrit-PatchSet: 2
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Owner: Max <msuraev at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Max <msuraev at sysmocom.de>