osmith has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ci/+/30351 )
Change subject: jobs/master-builds: don't only use debian 9 lxcs
......................................................................
jobs/master-builds: don't only use debian 9 lxcs
Change-Id: I62bf0b968103724ec676900de6cee65fdb00b9e4
---
M jobs/master-builds.yml
1 file changed, 22 insertions(+), 22 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml
index cc5f925..af36148 100644
--- a/jobs/master-builds.yml
+++ b/jobs/master-builds.yml
@@ -5,9 +5,9 @@
# following default values can be overridden by each repo
disabled: false
concurrent: true
- node: 'osmocom-master-debian9'
+ node: 'osmocom-master'
# axes related defaults
- slave_axis: !!python/tuple [osmocom-master-debian9]
+ slave_axis: !!python/tuple [osmocom-master]
a1_name: a1
a1: !!python/tuple [default]
a2_name: a2
@@ -211,7 +211,7 @@
- osmo-bsc-nat
- osmo-bts:
- slave_axis: !!python/tuple [osmocom-master-debian9, rpi4-raspbian11]
+ slave_axis: !!python/tuple [osmocom-master, rpi4-raspbian11]
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
@@ -219,16 +219,16 @@
a3_name: WITH_MANUALS
a3: !!python/tuple ["1", "0"]
combination_filter: >
- (FIRMWARE_VERSION == "master" && WITH_MANUALS == "1" && label ==
"osmocom-master-debian9") ||
+ (FIRMWARE_VERSION == "master" && WITH_MANUALS == "1" && label ==
"osmocom-master") ||
(FIRMWARE_VERSION == "master" && BTS_MODEL == "trx" &&
WITH_MANUALS == "0" && label == "rpi4-raspbian11") ||
- (FIRMWARE_VERSION == "femtobts_v2.7" && BTS_MODEL == "sysmo" &&
WITH_MANUALS == "0" && 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")
+ (FIRMWARE_VERSION == "femtobts_v2.7" && BTS_MODEL == "sysmo" &&
WITH_MANUALS == "0" && label == "osmocom-master") ||
+ (FIRMWARE_VERSION == "superfemto_v2.4" && BTS_MODEL == "sysmo" &&
WITH_MANUALS == "0" && label == "osmocom-master") ||
+ (FIRMWARE_VERSION == "superfemto_v3.0.1pre" && BTS_MODEL ==
"sysmo" && WITH_MANUALS == "0" && label == "osmocom-master") ||
+ (FIRMWARE_VERSION == "superfemto_v3.1" && BTS_MODEL == "sysmo" &&
WITH_MANUALS == "0" && label == "osmocom-master") ||
+ (FIRMWARE_VERSION == "superfemto_v5.1" && BTS_MODEL == "sysmo" &&
WITH_MANUALS == "0" && label == "osmocom-master") ||
+ (FIRMWARE_VERSION == "v2017.01" && BTS_MODEL == "lc15" &&
WITH_MANUALS == "0" && label == "osmocom-master") ||
+ (FIRMWARE_VERSION == "origin/nrw/litecell15" && BTS_MODEL ==
"lc15" && WITH_MANUALS == "0" && label == "osmocom-master") ||
+ (FIRMWARE_VERSION == "origin/nrw/oc2g" && BTS_MODEL == "oc2g" &&
WITH_MANUALS == "0" && label == "osmocom-master")
concurrent: false
cmd: |
{docker_run} \
@@ -285,7 +285,7 @@
email: jenkins-notificati...@lists.osmocom.org 246...@gmail.com
- osmo-gsm-manuals:
- node: 'osmocom-master-debian9'
+ node: 'osmocom-master'
- osmo-gsm-tester:
cmd: '{docker_run} {docker_img} {timeout_cmd}
/build/contrib/jenkins-build-manuals.sh'
@@ -323,7 +323,7 @@
- osmo-pcap
- osmo-pcu:
- slave_axis: !!python/tuple [osmocom-master-debian9, rpi4-raspbian11]
+ slave_axis: !!python/tuple [osmocom-master, rpi4-raspbian11]
a1_name: FIRMWARE_VERSION
a1: !!python/tuple [master, v2017.01, origin/nrw/litecell15]
a2_name: with_vty
@@ -333,11 +333,11 @@
a4_name: WITH_MANUALS
a4: !!python/tuple ["1", "0"]
combination_filter: >
- (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 == "True" && with_dsp == "sysmo" &&
FIRMWARE_VERSION=="master" && WITH_MANUALS == "0" && label == "osmocom-master")
||
+ (with_vty == "True" && with_dsp == "lc15" &&
FIRMWARE_VERSION=="master" && WITH_MANUALS == "0" && label == "osmocom-master")
||
+ (with_vty == "True" && with_dsp == "lc15" &&
FIRMWARE_VERSION=="v2017.01" && WITH_MANUALS == "0" && label ==
"osmocom-master") ||
+ (with_vty == "True" && with_dsp == "lc15" &&
FIRMWARE_VERSION=="origin/nrw/litecell15" && WITH_MANUALS == "0" && label ==
"osmocom-master") ||
+ (with_vty == "False" && with_dsp == "none" &&
FIRMWARE_VERSION=="master" && WITH_MANUALS == "1" && label == "osmocom-master")
||
(with_vty == "False" && with_dsp == "none" &&
FIRMWARE_VERSION=="master" && WITH_MANUALS == "0" && label == "rpi4-raspbian11")
cmd: |
{docker_run} \
@@ -368,14 +368,14 @@
email: jenkins-notificati...@lists.osmocom.org lafo...@gnumonks.org
246...@gmail.com
- osmo-trx:
- slave_axis: !!python/tuple [osmocom-master-debian9,rpi4-raspbian11]
+ slave_axis: !!python/tuple [osmocom-master,rpi4-raspbian11]
a1_name: INSTR
a1: !!python/tuple [--with-sse, --without-sse, --with-neon,
--with-neon-vfpv4]
a2_name: WITH_MANUALS
a2: !!python/tuple ["1", "0"]
combination_filter: >
- (INSTR == "--without-sse" && WITH_MANUALS == "1" && label ==
"osmocom-master-debian9") ||
- (INSTR == "--with-sse" && WITH_MANUALS == "0" && label ==
"osmocom-master-debian9") ||
+ (INSTR == "--without-sse" && WITH_MANUALS == "1" && label ==
"osmocom-master") ||
+ (INSTR == "--with-sse" && WITH_MANUALS == "0" && label ==
"osmocom-master") ||
(INSTR == "--with-neon" && WITH_MANUALS == "0" && label ==
"rpi4-raspbian11") ||
(INSTR == "--with-neon-vfpv4" && WITH_MANUALS == "0" && label ==
"rpi4-raspbian11")
cmd: |
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30351
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I62bf0b968103724ec676900de6cee65fdb00b9e4
Gerrit-Change-Number: 30351
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osm...@sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <lafo...@osmocom.org>
Gerrit-Reviewer: osmith <osm...@sysmocom.de>
Gerrit-Reviewer: pespin <pes...@sysmocom.de>
Gerrit-MessageType: merged
