From d9f89c12bb44c90eb6afdd0a4ade3192b319cf35 Mon Sep 17 00:00:00 2001
From: Stefan Kobza <skobza@cisco.com>
Date: Wed, 24 Feb 2016 15:45:21 +0100
Subject: Move csit-vpp-functional-hw-tb2 to zuul.

The job should be started only by adding 'hw-tb2-check' comment to gerrit.

Change-Id: I219568fc6756838939f74ed62f14d1a07b117e37
Signed-off-by: Stefan Kobza <skobza@cisco.com>
---
 jjb/csit/csit-vpp-functional.yaml | 17 ++++-------------
 zuul/layout.yaml                  | 19 ++++++++++++++++---
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/jjb/csit/csit-vpp-functional.yaml b/jjb/csit/csit-vpp-functional.yaml
index f6136eb24..1227aa65d 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 f731bb49b..1be239c2e 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:
-- 
cgit 1.2.3-korg