Harald Welte has uploaded this change for review. (
https://gerrit.osmocom.org/11484
Change subject: gerrot-osmo-bts: Don't use unsupported '/' in labels of
axis/matrix jobs
......................................................................
gerrot-osmo-bts: Don't use unsupported '/' in labels of axis/matrix jobs
It seems jenkins cannot deal with this, so we cannot specify something
like 'origin/nrw/oc2g-next' in a label. Let's work around by using only
oc2g-next here and expanding that to 'origin/nrw/oc2g-next' only in the
osmo-l1yer1-headers.sh script of osmo-ci.git
Change-Id: I9130a2f349f06a0b46b50665cef7188ddb08f666
---
M jobs/gerrit-verifications.yml
1 file changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/84/11484/1
diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml
index a989760..71a0904 100644
--- a/jobs/gerrit-verifications.yml
+++ b/jobs/gerrit-verifications.yml
@@ -87,7 +87,7 @@
- osmo-bts:
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, origin/nrw/oc2g-next]
+ 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
a2: !!python/tuple [sysmo, oct, trx, oct+trx, lc15, oc2g]
combination_filter: >
@@ -98,9 +98,9 @@
(FIRMWARE_VERSION == "superfemto_v3.1" && BTS_MODEL == "sysmo") ||
(FIRMWARE_VERSION == "superfemto_v5.1" && BTS_MODEL == "sysmo") ||
(FIRMWARE_VERSION == "v2017.01" && BTS_MODEL == "lc15") ||
- (FIRMWARE_VERSION == "origin/nrw/litecell15" && BTS_MODEL ==
"lc15") ||
- (FIRMWARE_VERSION == "origin/nrw/oc2g" && BTS_MODEL == "oc2g") ||
- (FIRMWARE_VERSION == "origin/nrw/oc2g-next" && BTS_MODEL == "oc2g")
+ (FIRMWARE_VERSION == "litecell15" && BTS_MODEL == "lc15") ||
+ (FIRMWARE_VERSION == "oc2g" && BTS_MODEL == "oc2g") ||
+ (FIRMWARE_VERSION == "oc2g-next" && BTS_MODEL == "oc2g")
cmd: './contrib/jenkins_bts_model.sh "$BTS_MODEL"'
- osmo-ggsn:
--
To view, visit https://gerrit.osmocom.org/11484
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9130a2f349f06a0b46b50665cef7188ddb08f666
Gerrit-Change-Number: 11484
Gerrit-PatchSet: 1
Gerrit-Owner: Harald Welte <lafo...@gnumonks.org>
