daniel has submitted this change and it was merged. (
https://gerrit.osmocom.org/12838 )
Change subject: jobs/osmo-bts: Build osmo-bts-oc2g as well
......................................................................
jobs/osmo-bts: Build osmo-bts-oc2g as well
Build osmo-bts with support for oc2g as well. Uses origin/nrw/oc2g as
firmware.
Fixes: OS#3745
Change-Id: Iaaeb44b949cf6403601f069800c381fe5eae2f6e
---
M jobs/master-builds.yml
1 file changed, 4 insertions(+), 3 deletions(-)
Approvals:
daniel: Verified
Harald Welte: Looks good to me, approved
diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml
index 52e3ca7..c908ed9 100644
--- a/jobs/master-builds.yml
+++ b/jobs/master-builds.yml
@@ -187,9 +187,9 @@
- 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]
+ 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
- a2: !!python/tuple [sysmo, oct, trx, oct+trx, lc15]
+ a2: !!python/tuple [sysmo, oct, trx, oct+trx, lc15, oc2g]
a3_name: WITH_MANUALS
a3: !!python/tuple ["1", "0"]
combination_filter: >
@@ -200,7 +200,8 @@
(FIRMWARE_VERSION == "superfemto_v3.1" && BTS_MODEL == "sysmo" &&
WITH_MANUALS == "0") ||
(FIRMWARE_VERSION == "superfemto_v5.1" && BTS_MODEL == "sysmo" &&
WITH_MANUALS == "0") ||
(FIRMWARE_VERSION == "v2017.01" && BTS_MODEL == "lc15" &&
WITH_MANUALS == "0") ||
- (FIRMWARE_VERSION == "origin/nrw/litecell15" && BTS_MODEL ==
"lc15" && WITH_MANUALS == "0")
+ (FIRMWARE_VERSION == "origin/nrw/litecell15" && BTS_MODEL ==
"lc15" && WITH_MANUALS == "0") ||
+ (FIRMWARE_VERSION == "origin/nrw/oc2g" && BTS_MODEL == "oc2g" &&
WITH_MANUALS == "0")
cmd: 'PUBLISH=1 ./contrib/jenkins_bts_model.sh "$BTS_MODEL"'
- osmo-ggsn:
--
To view, visit https://gerrit.osmocom.org/12838
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaaeb44b949cf6403601f069800c381fe5eae2f6e
Gerrit-Change-Number: 12838
Gerrit-PatchSet: 1
Gerrit-Owner: daniel <[email protected]>
Gerrit-Reviewer: Harald Welte <[email protected]>
Gerrit-Reviewer: Max <[email protected]>
Gerrit-Reviewer: daniel <[email protected]>
Gerrit-Reviewer: osmith <[email protected]>
