osmocom
/
osmo-ci
mirror of https://gerrit.osmocom.org/osmo-ci
10
0
Fork 1
Code Releases Activity

gerrit-verifications/master-builds: fix errors 

Fix three errors that prevented Jenkins from accepting the new
configs from Ie0643b17a6be6e86e281b50d78dd7a6858cf99ee
("gerrit-verifications/master-builds: WITH_MANUALS"):

* master-builds: fourth axis needs to be in the template or else the
  server will throw a 500 error. gerrit-verifications already has four
  template axes.
* gerrit-verifications/osmo-pcu: || at the end of combination_filter
* gerrit-verifications/osmo-sip-connector: missing ":"

Change-Id: I4ad63a3167e59b0837ffd1576fb7c7cf2958ff32
This commit is contained in:
Oliver Smith 2018-12-05 14:06:05 +01:00
parent e5e3773d52
commit d77968c3d6
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jobs/gerrit-verifications.yml
View File

@ -204,7 +204,7 @@
(with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="master" && WITH_MANUALS == "0") || (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="master" && WITH_MANUALS == "0") ||
(with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="v2017.01" && WITH_MANUALS == "0") || (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="v2017.01" && WITH_MANUALS == "0") ||
(with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="origin/nrw/litecell15" && WITH_MANUALS == "0") || (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="origin/nrw/litecell15" && WITH_MANUALS == "0") ||
(with_vty == "False" && with_dsp == "none" && FIRMWARE_VERSION=="master" && WITH_MANUALS == "1") || (with_vty == "False" && with_dsp == "none" && FIRMWARE_VERSION=="master" && WITH_MANUALS == "1")
- osmo-python-tests: - osmo-python-tests:
repos_url: 'ssh://jenkins@gerrit.osmocom.org:29418/python/{repos}' repos_url: 'ssh://jenkins@gerrit.osmocom.org:29418/python/{repos}'
@ -233,7 +233,7 @@
-v "$PWD:/build" -v "$HOME/bin:/build_bin" \ -v "$PWD:/build" -v "$HOME/bin:/build_bin" \
osmocom:amd64 /build/contrib/jenkins.sh osmocom:amd64 /build/contrib/jenkins.sh
- osmo-sip-connector - osmo-sip-connector:
cmd: WITH_MANUALS=1 ./contrib/jenkins.sh cmd: WITH_MANUALS=1 ./contrib/jenkins.sh
- osmo-trx: - osmo-trx:

6
jobs/master-builds.yml
View File

@ -14,6 +14,8 @@
a2: !!python/tuple [default] a2: !!python/tuple [default]
a3_name: a3 a3_name: a3
a3: !!python/tuple [default] a3: !!python/tuple [default]
a4_name: a4
a4: !!python/tuple [default]
combination_filter: '' combination_filter: ''
sequential: false sequential: false
# most common build invocation (PUBLISH=1 is prepended to publish manual PDFs) # most common build invocation (PUBLISH=1 is prepended to publish manual PDFs)
@ -408,6 +410,10 @@
type: user-defined type: user-defined
name: '{obj:a3_name}' name: '{obj:a3_name}'
values: '{obj:a3}' values: '{obj:a3}'
- axis:
type: user-defined
name: '{obj:a4_name}'
values: '{obj:a4}'
scm: scm:
- git: - git: