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
This commit is contained in:
Harald Welte 2018-10-27 13:38:21 +02:00
parent 499aea7836
commit 64d1d6c3b7
1 changed files with 4 additions and 4 deletions

View File

@ -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: