From c4259fc024bcc68009b91be9df63c8f5da203afe Mon Sep 17 00:00:00 2001
From: Jan Gelety <jgelety@cisco.com>
Date: Wed, 23 Mar 2016 13:58:30 +0100
Subject: Update of the job 'vpp-csit-verify-virl'

Job is updated to be run manually and to use
csit-verified branch to test vpp.

Change-Id: I7a56594cb840c374bc849c095241655290e6b0bd
Signed-off-by: Jan Gelety <jgelety@cisco.com>
---
 jjb/vpp/include-raw-vpp-csit-functional.sh |  2 +-
 jjb/vpp/vpp.yaml                           | 20 ++++++++++++++++----
 zuul/layout.yaml                           |  6 +++---
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/jjb/vpp/include-raw-vpp-csit-functional.sh b/jjb/vpp/include-raw-vpp-csit-functional.sh
index e0767c644..93be0adbc 100644
--- a/jjb/vpp/include-raw-vpp-csit-functional.sh
+++ b/jjb/vpp/include-raw-vpp-csit-functional.sh
@@ -2,7 +2,7 @@
 set -xeu -o pipefail
 
 # Clone csit and start tests
-git clone https://gerrit.fd.io/r/csit
+git clone https://gerrit.fd.io/r/csit --branch csit-verified
 
 cp build-root/*.deb csit/
 cd csit
diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index 3283832a2..103c72d16 100644
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -102,7 +102,7 @@
     name: 'vpp-csit-verify-virl'
 
     project-type: freestyle
-    node: verify-merge
+    node: verify
     concurrent: false
 
     logrotate:
@@ -111,17 +111,29 @@
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
+    parameters:
+        - project-parameter:
+            project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+
     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:
+            comment-trigger-value: 'manualrun'
+            name: '{project}'
+            branch: '{branch}'
+
     builders:
         - shell:
             !include-raw-escape include-raw-vpp-build.sh
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 7d46e50e8..3935a1121 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -125,7 +125,7 @@ projects:
 #    template:
 #      - name: default-jobs
 
-  - name: vpp
-    check-novote:
-      - vpp-csit-verify-virl
+#  - name: vpp
+#    check-novote:
+#      - vpp-csit-verify-virl
 
-- 
cgit 1.2.3-korg