Change in osmo-ci[master]: jobs/osmo-bts: Build osmo-bts-oc2g as well

2019-02-05 Thread daniel
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 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Max 
Gerrit-Reviewer: daniel 
Gerrit-Reviewer: osmith 


Change in osmo-ci[master]: jobs/osmo-bts: Build osmo-bts-oc2g as well

2019-02-05 Thread Harald Welte
Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/12838 )

Change subject: jobs/osmo-bts: Build osmo-bts-oc2g as well
..


Patch Set 1: Code-Review+2


--
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: comment
Gerrit-Change-Id: Iaaeb44b949cf6403601f069800c381fe5eae2f6e
Gerrit-Change-Number: 12838
Gerrit-PatchSet: 1
Gerrit-Owner: daniel 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Max 
Gerrit-Reviewer: daniel 
Gerrit-Reviewer: osmith 
Gerrit-Comment-Date: Tue, 05 Feb 2019 16:20:31 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes


Change in osmo-ci[master]: jobs/osmo-bts: Build osmo-bts-oc2g as well

2019-02-05 Thread osmith
osmith has posted comments on this change. ( https://gerrit.osmocom.org/12838 )

Change subject: jobs/osmo-bts: Build osmo-bts-oc2g as well
..


Patch Set 1:

(1 comment)

https://gerrit.osmocom.org/#/c/12838/1//COMMIT_MSG
Commit Message:

https://gerrit.osmocom.org/#/c/12838/1//COMMIT_MSG@7
PS1, Line 7: jobs/osmo-bts: Build osmo-bts-oc2g as well
jobs/master-builds.yml?



--
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: comment
Gerrit-Change-Id: Iaaeb44b949cf6403601f069800c381fe5eae2f6e
Gerrit-Change-Number: 12838
Gerrit-PatchSet: 1
Gerrit-Owner: daniel 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Max 
Gerrit-Reviewer: daniel 
Gerrit-Reviewer: osmith 
Gerrit-Comment-Date: Tue, 05 Feb 2019 16:14:24 +
Gerrit-HasComments: Yes
Gerrit-HasLabels: No


Change in osmo-ci[master]: jobs/osmo-bts: Build osmo-bts-oc2g as well

2019-02-05 Thread daniel
daniel has posted comments on this change. ( https://gerrit.osmocom.org/12838 )

Change subject: jobs/osmo-bts: Build osmo-bts-oc2g as well
..


Patch Set 1: Verified+1

Build runs through on jenkins


--
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: comment
Gerrit-Change-Id: Iaaeb44b949cf6403601f069800c381fe5eae2f6e
Gerrit-Change-Number: 12838
Gerrit-PatchSet: 1
Gerrit-Owner: daniel 
Gerrit-Reviewer: daniel 
Gerrit-Comment-Date: Tue, 05 Feb 2019 16:03:47 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes


Change in osmo-ci[master]: jobs/osmo-bts: Build osmo-bts-oc2g as well

2019-02-05 Thread daniel
daniel has uploaded this change for review. ( 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(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/38/12838/1

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: newchange
Gerrit-Change-Id: Iaaeb44b949cf6403601f069800c381fe5eae2f6e
Gerrit-Change-Number: 12838
Gerrit-PatchSet: 1
Gerrit-Owner: daniel