diff options
| -rw-r--r-- | jjb/csit/csit-vpp-functional.yaml | 29 | ||||
| -rw-r--r-- | zuul/layout.yaml | 6 |
2 files changed, 23 insertions, 12 deletions
diff --git a/jjb/csit/csit-vpp-functional.yaml b/jjb/csit/csit-vpp-functional.yaml index 3b12621a..d4d277f0 100644 --- a/jjb/csit/csit-vpp-functional.yaml +++ b/jjb/csit/csit-vpp-functional.yaml @@ -15,8 +15,8 @@ name: 'csit-vpp-functional-virl' project-type: freestyle - node: verify_merge - concurrent: false + node: verify + concurrent: true logrotate: daysToKeep: '{build-days-to-keep}' @@ -25,16 +25,21 @@ artifactNumToKeep: '{build-artifact-num-to-keep}' scm: - - zuul-trigger-scm: + - gerrit-trigger-scm: credentials-id: '{ssh-credentials}' - refspec: '$ZUUL_REF' - commit: '$ZUUL_COMMIT' + refspec: '$GERRIT_REFSPEC' + choosing-strategy: 'gerrit' wrappers: - ssh-agent-credentials: users: - '{ssh-credentials}' + triggers: + - gerrit-trigger-patch-submitted: + name: '{project}' + branch: '{branch}' + builders: - shell: !include-raw-escape include-raw-csit-vpp-functional-virl.sh @@ -50,7 +55,7 @@ name: 'csit-vpp-functional-hw-tb2' project-type: freestyle - node: verify_merge + node: verify concurrent: false logrotate: @@ -60,16 +65,22 @@ artifactNumToKeep: '{build-artifact-num-to-keep}' scm: - - zuul-trigger-scm: + - gerrit-trigger-scm: credentials-id: '{ssh-credentials}' - refspec: '$ZUUL_REF' - commit: '$ZUUL_COMMIT' + refspec: '$GERRIT_REFSPEC' + choosing-strategy: 'gerrit' wrappers: - ssh-agent-credentials: users: - '{ssh-credentials}' + triggers: + - gerrit-trigger-manually-triggered: + name: '{project}' + branch: '{branch}' + comment-trigger-value: 'hw-perf-check' + builders: - shell: !include-raw-escape jjb/csit/include-raw-csit-vpp-functional-hw-tb2.sh diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 993f999f..7d46e50e 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -115,10 +115,10 @@ projects: - ci-management-merge-nodepool - name: csit - csit-manual-perf: - - csit-vpp-functional-hw-tb2 +# csit-manual-perf: +# - csit-vpp-functional-hw-tb2 check: - - csit-vpp-functional-virl +# - csit-vpp-functional-virl - csit-vpp-functional-nodepool # - name: honeycomb |