diff options
| author | Oliver Smith <osmith@sysmocom.de> | 2018-12-05 14:06:05 +0100 |
|---|---|---|
| committer | Oliver Smith <osmith@sysmocom.de> | 2018-12-05 14:49:18 +0100 |
| commit | d77968c3d64751a5ff9b08a378e118980ada1c3e (patch) | |
| tree | 9a26469b3d9fe87adff93f069cebf68f477899b4 /jobs | |
| parent | e5e3773d5207d8f91cf2985bd7d3b386ea10b331 (diff) | |
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
Diffstat (limited to 'jobs')
| -rw-r--r-- | jobs/gerrit-verifications.yml | 4 | ||||
| -rw-r--r-- | jobs/master-builds.yml | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index 83f1c30..d17934d 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -204,7 +204,7 @@ (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=="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: repos_url: 'ssh://jenkins@gerrit.osmocom.org:29418/python/{repos}' @@ -233,7 +233,7 @@ -v "$PWD:/build" -v "$HOME/bin:/build_bin" \ osmocom:amd64 /build/contrib/jenkins.sh - - osmo-sip-connector + - osmo-sip-connector: cmd: WITH_MANUALS=1 ./contrib/jenkins.sh - osmo-trx: diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 4988062..1b7cdfd 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -14,6 +14,8 @@ a2: !!python/tuple [default] a3_name: a3 a3: !!python/tuple [default] + a4_name: a4 + a4: !!python/tuple [default] combination_filter: '' sequential: false # most common build invocation (PUBLISH=1 is prepended to publish manual PDFs) @@ -408,6 +410,10 @@ type: user-defined name: '{obj:a3_name}' values: '{obj:a3}' + - axis: + type: user-defined + name: '{obj:a4_name}' + values: '{obj:a4}' scm: - git: |