diff options
author | Pau Espin Pedrol <pespin@sysmocom.de> | 2020-02-19 18:18:55 +0100 |
---|---|---|
committer | laforge <laforge@osmocom.org> | 2020-02-26 08:39:27 +0000 |
commit | 4f98ae06a3fa18d150789116d9bf22f03ac764e4 (patch) | |
tree | a663ad2d910965252013fbcd714e7f552c894241 | |
parent | 6755bc30920a0984971eeea32a92f0188cdc6be6 (diff) |
job: Update master and gerrit osmo-trx jobs to also build on ARM platform
Related: OS#4301
Change-Id: I0049ab35b5106d5af8474903e203f66b044ff5ca
-rw-r--r-- | jobs/gerrit-verifications.yml | 9 | ||||
-rw-r--r-- | jobs/master-builds.yml | 9 |
2 files changed, 10 insertions, 8 deletions
diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index 80a3b08..e946674 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -206,14 +206,15 @@ - osmo-sip-connector - osmo-trx: + slave_axis: !!python/tuple [osmocom-master-debian9,rpi4-deb9build-ansible] a1_name: INSTR - # ARM variants temporarily disabled due to issue OS#3061 (mind the combination_filter below!) - # a1: !!python/tuple [--with-sse, --with-neon, --with-neon-vfpv4] - a1: !!python/tuple [--with-sse] + a1: !!python/tuple [--with-sse, --with-neon, --with-neon-vfpv4] a2_name: WITH_MANUALS a2: !!python/tuple ["1", "0"] combination_filter: > - (INSTR == "--with-sse" && WITH_MANUALS == "1") + (INSTR == "--with-sse" && WITH_MANUALS == "1" && label == "osmocom-master-debian9") || + (INSTR == "--with-neon" && WITH_MANUALS == "0" && label == "rpi4-deb9build-ansible") || + (INSTR == "--with-neon-vfpv4" && WITH_MANUALS == "0" && label == "rpi4-deb9build-ansible") cmd: 'ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh' - osmocom-bb diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 78aeb7c..688ee15 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -299,14 +299,15 @@ email: gerrit-log@lists.osmocom.org laforge@gnumonks.org 246tnt@gmail.com - osmo-trx: + slave_axis: !!python/tuple [osmocom-master-debian9,rpi4-deb9build-ansible] a1_name: INSTR - # ARM variants temporarily disabled due to issue OS#3061 (mind the combination_filter below!) - # a1: !!python/tuple [--with-sse, --with-neon, --with-neon-vfpv4] - a1: !!python/tuple [--with-sse] + a1: !!python/tuple [--with-sse, --with-neon, --with-neon-vfpv4] a2_name: WITH_MANUALS a2: !!python/tuple ["1", "0"] combination_filter: > - (INSTR == "--with-sse" && WITH_MANUALS == "1") + (INSTR == "--with-sse" && WITH_MANUALS == "1" && label == "osmocom-master-debian9") || + (INSTR == "--with-neon" && WITH_MANUALS == "0" && label == "rpi4-deb9build-ansible") || + (INSTR == "--with-neon-vfpv4" && WITH_MANUALS == "0" && label == "rpi4-deb9build-ansible") cmd: 'PUBLISH=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh' - osmocom-bb |