diff options
| author |   Trevor Bramwell <tbramwell@linuxfoundation.org> | 2018-05-25 14:50:37 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-05-25 14:50:37 +0000 |
| commit | f418aa3b4b4d1659a9d0fbd36cb604f7b64e559f (patch) | |
| tree | ee114872de5abebebc59701ea9a7bb1ef0e22a1b /jjb | |
| parent | 49818aa04def6cb9ee96f2dcf7b83b3868a165b6 (diff) | |
| parent | f7bd34100cdee6eb8e69d471c1a4ae67320e4abb (diff) | |
Merge "Apex: Fix blocking on promote and artifact ver"
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/apex/apex-verify-jobs.yaml | 1 | ||||
| -rw-r--r-- | jjb/apex/apex.yaml | 7 | ||||
| -rw-r--r-- | jjb/apex/apex.yaml.j2 | 7 |
3 files changed, 9 insertions, 6 deletions
diff --git a/jjb/apex/apex-verify-jobs.yaml b/jjb/apex/apex-verify-jobs.yaml index 7dbd6709b..f8e967bd0 100644 --- a/jjb/apex/apex-verify-jobs.yaml +++ b/jjb/apex/apex-verify-jobs.yaml @@ -309,6 +309,7 @@ blocking-jobs: - 'apex-verify.*' - 'apex-virtual.*' + - 'apex-.*-promote.*' - throttle: max-per-node: 1 max-total: 10 diff --git a/jjb/apex/apex.yaml b/jjb/apex/apex.yaml index ab0b8275b..420c35904 100644 --- a/jjb/apex/apex.yaml +++ b/jjb/apex/apex.yaml @@ -389,7 +389,6 @@ block-level: 'NODE' blocking-jobs: - 'apex-runner.*' - - 'apex-.*-promote.*' - 'apex-run.*' - 'apex-virtual-.*' - 'apex-verify-gate-.*' @@ -577,7 +576,6 @@ blocking-jobs: - 'apex-verify.*' - 'apex-runner.*' - - 'apex-.*-promote.*' - 'apex-run.*' - 'apex-testsuite-.+-baremetal-.+' - throttle: @@ -785,6 +783,10 @@ branch: '{branch}' - apex-parameter: gs-pathname: '{gs-pathname}' + - string: + name: ARTIFACT_VERSION + default: dev + description: "Used for overriding the ARTIFACT_VERSION" properties: - build-blocker: @@ -792,7 +794,6 @@ block-level: 'NODE' blocking-jobs: - 'apex-verify.*' - - 'apex-deploy.*' - 'apex-runner.*' - 'apex-daily.*' diff --git a/jjb/apex/apex.yaml.j2 b/jjb/apex/apex.yaml.j2 index 8157aa1de..a9317baca 100644 --- a/jjb/apex/apex.yaml.j2 +++ b/jjb/apex/apex.yaml.j2 @@ -269,7 +269,6 @@ block-level: 'NODE' blocking-jobs: - 'apex-runner.*' - - 'apex-.*-promote.*' - 'apex-run.*' - 'apex-virtual-.*' - 'apex-verify-gate-.*' @@ -457,7 +456,6 @@ blocking-jobs: - 'apex-verify.*' - 'apex-runner.*' - - 'apex-.*-promote.*' - 'apex-run.*' - 'apex-testsuite-.+-baremetal-.+' - throttle: @@ -665,6 +663,10 @@ branch: '{branch}' - apex-parameter: gs-pathname: '{gs-pathname}' + - string: + name: ARTIFACT_VERSION + default: dev + description: "Used for overriding the ARTIFACT_VERSION" properties: - build-blocker: @@ -672,7 +674,6 @@ block-level: 'NODE' blocking-jobs: - 'apex-verify.*' - - 'apex-deploy.*' - 'apex-runner.*' - 'apex-daily.*' |