diff options
| author |   Ed Kern <ejk@cisco.com> | 2018-02-12 12:36:32 -0700 |
|---|---|---|
| committer | Ed Kern <ejk@cisco.com> | 2018-02-12 12:37:44 -0700 |
| commit | e70b2212f8fdef3302560e2aa0192f52401c4141 (patch) | |
| tree | bf25c16b717ea2e443da7cfcc09088c261dcde44 | |
| parent | 7bf691715084fa1ee0450b12b5c79c3a03e17c48 (diff) | |
VPP: cpoc out of test but still skip vote
Change-Id: I613cf44ca7c9ea2c8aa39105a7f09ce3ffed5b93
Signed-off-by: Ed Kern <ejk@cisco.com>
| -rw-r--r-- | jjb/global-macros.yaml | 27 | ||||
| -rw-r--r-- | jjb/vpp/vpp.yaml | 14 |
2 files changed, 37 insertions, 4 deletions
diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml index be96bd9bf..f4b5780f2 100644 --- a/jjb/global-macros.yaml +++ b/jjb/global-macros.yaml @@ -217,6 +217,33 @@ branch-pattern: '**/{branch}' - trigger: + name: gerrit-trigger-trivial-patch-submitted-skip-vote + triggers: + - gerrit: + server-name: 'Primary' + trigger-on: + - patchset-created-event: + exclude-drafts: 'false' + exclude-trivial-rebase: 'true' + exclude-no-code-change: 'true' + - draft-published-event + - comment-added-contains-event: + comment-contains-value: 'recheck' + - comment-added-contains-event: + comment-contains-value: 'reverify' + projects: + - project-compare-type: 'ANT' + project-pattern: '{name}' + branches: + - branch-compare-type: 'ANT' + branch-pattern: '**/{branch}' + skip-vote: + successful: true + failed: true + unstable: true + notbuilt: true + +- trigger: name: gerrit-trigger-manually-triggered triggers: - gerrit: diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index 5742367b5..7176ff885 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -9,7 +9,7 @@ - 'vpp-make-test-docs-merge-{stream}' - 'vpp-make-test-docs-verify-{stream}' - 'vpp-promote-{stream}-{os}' - - 'vpp-test-poc-verify-{stream}-{os}' + - 'vpp-cpoc-verify-{stream}-{os}' project: 'vpp' os: @@ -706,10 +706,10 @@ maven-version: 'mvn33-new' - job-template: - name: 'vpp-test-poc-verify-{stream}-{os}' + name: 'vpp-cpoc-verify-{stream}-{os}' project-type: freestyle - node: '{os}-m' + node: '{os}-us' concurrent: true logrotate: @@ -743,6 +743,9 @@ name: '{project}' branch: '{branch}' comment-trigger-value: 'test-cpoc' + - gerrit-trigger-trivial-patch-submitted-skip-vote: + name: '{project}' + branch: '{branch}' builders: - shell: @@ -764,6 +767,9 @@ - fdio-infra-shiplogs: maven-version: 'mvn33-new' archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core' - - retry-build-on-builder-error + - naginator: + rerun-unstable-builds: true + max-failed-builds: 1 + fixed-delay: 10 |