summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--jjb/csit/csit-vpp-functional.yaml17
-rw-r--r--zuul/layout.yaml19
2 files changed, 20 insertions, 16 deletions
diff --git a/jjb/csit/csit-vpp-functional.yaml b/jjb/csit/csit-vpp-functional.yaml
index f6136eb2..1227aa65 100644
--- a/jjb/csit/csit-vpp-functional.yaml
+++ b/jjb/csit/csit-vpp-functional.yaml
@@ -78,7 +78,7 @@
name: 'csit-vpp-functional-hw-tb2'
project-type: freestyle
- node: verify
+ node: verify_merge
concurrent: false
logrotate:
@@ -92,26 +92,17 @@
project: '{project}'
- gerrit-parameter:
branch: '{branch}'
- - string:
- name: 'VPP_URLS'
- default: ''
- description: 'Space separated VPP *.deb URLs from nexus'
scm:
- - gerrit-trigger-scm:
+ - zuul-trigger-scm:
credentials-id: '{ssh-credentials}'
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
+ refspec: '$ZUUL_REF'
+ commit: '$ZUUL_COMMIT'
wrappers:
- ssh-agent-credentials:
users:
- '{ssh-credentials}'
- triggers:
- - gerrit-trigger-manually-triggered:
- name: '{project}'
- branch: '{branch}'
- comment-trigger-value: 'hw-tb2-recheck'
builders:
- shell:
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index f731bb49..1be239c2 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -61,6 +61,19 @@ pipelines:
gerrit: {}
failure:
gerrit: {}
+ - name: csit-manual-perf
+ source: gerrit
+ manager: IndependentPipelineManager
+ trigger:
+ gerrit:
+ - event: comment-added
+ comment: (?i)^(Patch Set [0-9]+:)?( [\w\\+-]*)*(\n\n)?\s*(hw-perf-check)
+ success:
+ gerrit:
+ verified: 1
+ failure:
+ gerrit:
+ verified: -1
##############################################################################
### Project Templates
@@ -88,9 +101,9 @@ projects:
- ci-management-merge-zuul
- ci-management-merge-nodepool
-# - name: csit
-# check:
-# - csit-vpp-bridge-domain
+ - name: csit
+ csit-manual-perf:
+ - csit-vpp-functional-hw-tb2
# - name: honeycomb
# template: