aboutsummaryrefslogtreecommitdiffstats
path: root/jobs
diff options
context:
space:
mode:
authorPau Espin Pedrol <pespin@sysmocom.de>2018-04-17 17:12:16 +0200
committerPau Espin Pedrol <pespin@sysmocom.de>2018-04-17 17:13:07 +0200
commit8e48f3d75e011454ce271be42c88771f4c8553fc (patch)
treedd1612b87db8ad20dfa6433286cd9db830bde1df /jobs
parentbd20389e492972d5435f288cc80aeda37db8ffbd (diff)
jobs: bts&pcu: lc15: fetch branch litecell15 instead of litecell15-next
Branch nrw/litecell15-next doesn't exist anymore in the remote of that repository (https://gitlab.com/nrw_litecell15/litecell15-fw). Change-Id: I162e81573d7aafc0b2e2e1d2ab90cacc7cbb90d7
Diffstat (limited to 'jobs')
-rw-r--r--jobs/gerrit-verifications.yml8
-rw-r--r--jobs/master-builds.yml8
2 files changed, 8 insertions, 8 deletions
diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml
index 7613802..89b98ed 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-next]
+ 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]
a2_name: BTS_MODEL
a2: !!python/tuple [sysmo, oct, trx, oct+trx, lc15]
combination_filter: >
@@ -98,7 +98,7 @@
(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-next" && BTS_MODEL == "lc15")
+ (FIRMWARE_VERSION == "origin/nrw/litecell15" && BTS_MODEL == "lc15")
cmd: './contrib/jenkins_bts_model.sh "$BTS_MODEL"'
- osmo-ggsn:
@@ -143,7 +143,7 @@
- osmo-pcu:
a1_name: FIRMWARE_VERSION
- a1: !!python/tuple [master, v2017.01, origin/nrw/litecell15-next]
+ a1: !!python/tuple [master, v2017.01, origin/nrw/litecell15]
a2_name: with_vty
a2: !!python/tuple [True, False]
a3_name: with_dsp
@@ -153,7 +153,7 @@
(with_vty == "True" && with_dsp == "sysmo" && FIRMWARE_VERSION=="master") ||
(with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="master") ||
(with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="v2017.01") ||
- (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="origin/nrw/litecell15-next") ||
+ (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="origin/nrw/litecell15") ||
(with_vty == "False" && with_dsp == "none" && FIRMWARE_VERSION=="master")
- osmo-python-tests:
diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml
index dff78fa..3fd5814 100644
--- a/jobs/master-builds.yml
+++ b/jobs/master-builds.yml
@@ -183,7 +183,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-next]
+ 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]
a2_name: BTS_MODEL
a2: !!python/tuple [sysmo, oct, trx, oct+trx, lc15]
combination_filter: >
@@ -194,7 +194,7 @@
(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-next" && BTS_MODEL == "lc15")
+ (FIRMWARE_VERSION == "origin/nrw/litecell15" && BTS_MODEL == "lc15")
cmd: './contrib/jenkins_bts_model.sh "$BTS_MODEL"'
- osmo-ggsn:
@@ -276,7 +276,7 @@
- '*/master'
- '*/jerlbeck/master'
a1_name: FIRMWARE_VERSION
- a1: !!python/tuple [master, v2017.01, origin/nrw/litecell15-next]
+ a1: !!python/tuple [master, v2017.01, origin/nrw/litecell15]
a2_name: with_vty
a2: !!python/tuple [True, False]
a3_name: with_dsp
@@ -286,7 +286,7 @@
(with_vty == "True" && with_dsp == "sysmo" && FIRMWARE_VERSION=="master") ||
(with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="master") ||
(with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="v2017.01") ||
- (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="origin/nrw/litecell15-next") ||
+ (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="origin/nrw/litecell15") ||
(with_vty == "False" && with_dsp == "none" && FIRMWARE_VERSION=="master")
- osmo-sgsn: