osmith has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ci/+/30349 )
Change subject: jobs/gerrit: don't only use debian 9 lxcs
......................................................................
jobs/gerrit: don't only use debian 9 lxcs
Change-Id: I2d14bffb09439e031dec3ab3633a36710434a229
---
M jobs/gerrit-verifications.yml
1 file changed, 26 insertions(+), 26 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/49/30349/1
diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml
index 2bbfe4e..24dc80d 100644
--- a/jobs/gerrit-verifications.yml
+++ b/jobs/gerrit-verifications.yml
@@ -31,9 +31,9 @@
# following default values can be overridden by each repo
disabled: false
concurrent: true
- node: osmocom-gerrit-debian9
+ node: osmocom-gerrit
# axes related defaults
- slave_axis: !!python/tuple [osmocom-gerrit-debian9]
+ slave_axis: !!python/tuple [osmocom-gerrit]
a1_name: a1
a1: !!python/tuple [default]
a2_name: a2
@@ -133,7 +133,7 @@
- osmo-bsc-nat
- osmo-bts:
- slave_axis: !!python/tuple [osmocom-master-debian9, rpi4-raspbian11]
+ slave_axis: !!python/tuple [osmocom-gerrit, 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, litecell15,
oc2g, oc2g-next]
a2_name: BTS_MODEL
@@ -141,17 +141,17 @@
a3_name: WITH_MANUALS
a3: !!python/tuple ["1", "0"]
combination_filter: >
- (FIRMWARE_VERSION == "master" && WITH_MANUALS == "0" && label ==
"osmocom-master-debian9") ||
+ (FIRMWARE_VERSION == "master" && WITH_MANUALS == "0" && label ==
"osmocom-gerrit") ||
(FIRMWARE_VERSION == "master" && BTS_MODEL == "trx" &&
WITH_MANUALS == "0" && label == "rpi4-raspbian11") ||
- (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")
+ (FIRMWARE_VERSION == "femtobts_v2.7" && BTS_MODEL == "sysmo" &&
WITH_MANUALS == "1" && label == "osmocom-gerrit") ||
+ (FIRMWARE_VERSION == "superfemto_v2.4" && BTS_MODEL == "sysmo" &&
WITH_MANUALS == "0" && label == "osmocom-gerrit") ||
+ (FIRMWARE_VERSION == "superfemto_v3.0.1pre" && BTS_MODEL ==
"sysmo" && WITH_MANUALS == "0" && label == "osmocom-gerrit") ||
+ (FIRMWARE_VERSION == "superfemto_v3.1" && BTS_MODEL == "sysmo" &&
WITH_MANUALS == "0" && label == "osmocom-gerrit") ||
+ (FIRMWARE_VERSION == "superfemto_v5.1" && BTS_MODEL == "sysmo" &&
WITH_MANUALS == "0" && label == "osmocom-gerrit") ||
+ (FIRMWARE_VERSION == "v2017.01" && BTS_MODEL == "lc15" &&
WITH_MANUALS == "0" && label == "osmocom-gerrit") ||
+ (FIRMWARE_VERSION == "litecell15" && BTS_MODEL == "lc15" &&
WITH_MANUALS == "0" && label == "osmocom-gerrit") ||
+ (FIRMWARE_VERSION == "oc2g" && BTS_MODEL == "oc2g" && WITH_MANUALS
== "0" && label == "osmocom-gerrit") ||
+ (FIRMWARE_VERSION == "oc2g-next" && BTS_MODEL == "oc2g" &&
WITH_MANUALS == "0" && label == "osmocom-gerrit")
concurrent: false
cmd: |
{docker_run} \
@@ -228,7 +228,7 @@
- osmo-pcap
- osmo-pcu:
- slave_axis: !!python/tuple [osmocom-master-debian9, rpi4-raspbian11]
+ slave_axis: !!python/tuple [osmocom-gerrit, rpi4-raspbian11]
a1_name: FIRMWARE_VERSION
a1: !!python/tuple [master, v2017.01, litecell15, oc2g]
a2_name: with_vty
@@ -238,12 +238,12 @@
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=="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 == "True" && with_dsp == "sysmo" &&
FIRMWARE_VERSION=="master" && WITH_MANUALS == "0" && label == "osmocom-gerrit")
||
+ (with_vty == "True" && with_dsp == "lc15" &&
FIRMWARE_VERSION=="master" && WITH_MANUALS == "0" && label == "osmocom-gerrit")
||
+ (with_vty == "True" && with_dsp == "lc15" &&
FIRMWARE_VERSION=="v2017.01" && WITH_MANUALS == "0" && label ==
"osmocom-gerrit") ||
+ (with_vty == "True" && with_dsp == "lc15" &&
FIRMWARE_VERSION=="litecell15" && WITH_MANUALS == "0" && label ==
"osmocom-gerrit") ||
+ (with_vty == "True" && with_dsp == "oc2g" &&
FIRMWARE_VERSION=="oc2g" && WITH_MANUALS == "0" && label == "osmocom-gerrit") ||
+ (with_vty == "False" && with_dsp == "none" &&
FIRMWARE_VERSION=="master" && WITH_MANUALS == "1" && label == "osmocom-gerrit")
||
(with_vty == "False" && with_dsp == "none" &&
FIRMWARE_VERSION=="master" && WITH_MANUALS == "0" && label == "rpi4-raspbian11")
cmd: |
{docker_run} \
@@ -280,14 +280,14 @@
- osmo-sip-connector
- osmo-trx:
- slave_axis: !!python/tuple [osmocom-master-debian9,rpi4-raspbian11]
+ slave_axis: !!python/tuple [osmocom-gerrit,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-gerrit") ||
+ (INSTR == "--with-sse" && WITH_MANUALS == "0" && label ==
"osmocom-gerrit") ||
(INSTR == "--with-neon" && WITH_MANUALS == "0" && label ==
"rpi4-raspbian11") ||
(INSTR == "--with-neon-vfpv4" && WITH_MANUALS == "0" && label ==
"rpi4-raspbian11")
cmd: |
@@ -339,13 +339,13 @@
- pysim:
concurrent: false
- slave_axis: !!python/tuple [simtester,osmocom-master]
+ slave_axis: !!python/tuple [simtester,osmocom-gerrit]
a2_name: JOB_TYPE
a2: !!python/tuple ["test", "pylint", "docs"]
combination_filter: >
(JOB_TYPE == "test" && label == "simtester") ||
- (JOB_TYPE == "pylint" && label == "osmocom-master") ||
- (JOB_TYPE == "docs" && label == "osmocom-master")
+ (JOB_TYPE == "pylint" && label == "osmocom-gerrit") ||
+ (JOB_TYPE == "docs" && label == "osmocom-gerrit")
cmd: |
case "$JOB_TYPE" in
"test")
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30349
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I2d14bffb09439e031dec3ab3633a36710434a229
Gerrit-Change-Number: 30349
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <[email protected]>
Gerrit-MessageType: newchange
