diff options
| author |   Ed Kern <ejk@cisco.com> | 2019-01-22 16:05:14 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@fd.io> | 2019-01-22 16:05:14 +0000 |
| commit | 5d6957213db905668370f4cd292f97f843c784c4 (patch) | |
| tree | a165b64880da50b965bcfeb4e6b6186e6493e8a5 /jjb/vpp | |
| parent | 8b00f8a9c2eda66af203a63317bd28069142ddf0 (diff) | |
| parent | 36a4bc060192f9a3e4f4bff044c7c1fb19ef57bb (diff) | |
Merge "Change automatic to manual trigger for VIRL job for VPP project"
Diffstat (limited to 'jjb/vpp')
| -rw-r--r-- | jjb/vpp/vpp-macros.yaml | 40 | ||||
| -rw-r--r-- | jjb/vpp/vpp.yaml | 34 |
2 files changed, 44 insertions, 30 deletions
diff --git a/jjb/vpp/vpp-macros.yaml b/jjb/vpp/vpp-macros.yaml index a11ca9bf5..bb35466f0 100644 --- a/jjb/vpp/vpp-macros.yaml +++ b/jjb/vpp/vpp-macros.yaml @@ -38,3 +38,43 @@ gerrit-build-failed-verified-value: 1 gerrit-build-unstable-verified-value: 1 gerrit-build-notbuilt-verified-value: 1 + +- trigger: + name: gerrit-trigger-csit-perftest + triggers: + - gerrit: + server-name: 'Primary' + trigger-on: + - comment-added-contains-event: + comment-contains-value: 'perftest' + 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-csit-virltest + triggers: + - gerrit: + server-name: 'Primary' + trigger-on: + - comment-added-contains-event: + comment-contains-value: 'virltest' + 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 diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index 5e8a216cf..53694b066 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -32,10 +32,6 @@ branch: 'stable/1901' repo-stream-part: 'stable.1901' - type: - - short - - long - - project: name: vpp-clang jobs: @@ -966,7 +962,7 @@ build-timeout: '90' triggers: - - gerrit-trigger-checkstyle-nonvoting: + - gerrit-trigger-csit-virltest: name: '{project}' branch: '{branch}' @@ -1045,22 +1041,9 @@ build-timeout: 300 triggers: - - gerrit: - server-name: 'Primary' - trigger-on: - - comment-added-contains-event: - comment-contains-value: 'perftest' - projects: - - project-compare-type: 'ANT' - project-pattern: '{project}' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/{branch}' - skip-vote: - successful: true - failed: true - unstable: true - notbuilt: true + - gerrit-trigger-csit-perftest: + name: '{project}' + branch: '{branch}' builders: - shell: @@ -1079,12 +1062,3 @@ - fdio-infra-shiplogs: maven-version: 'mvn33-new' - -- parameter: - name: type-parameter - - parameters: - - string: - name: TYPE - default: '{type}' - description: "TYPE parameter if not given by trigger" |