Move csit-vpp-functional-virl to zuul.

Change-Id: I240b93105039e8838f711f545eafd95f354bee16
Signed-off-by: Stefan Kobza <skobza@cisco.com>

diff --git a/jjb/csit/csit-vpp-functional.yaml b/jjb/csit/csit-vpp-functional.yaml
index c2da4da..b0ac186 100644 (file)
--- a/jjb/csit/csit-vpp-functional.yaml
+++ b/jjb/csit/csit-vpp-functional.yaml
@@ -3,18 +3,17 @@
     description: 'Run VPP functional tests on VIRL.'
 
     jobs:
-        - 'csit-vpp-{functionality}'
+        - 'csit-vpp-functional-virl'
 
     project: 'csit'
     branch: 'master'
 
-    functionality: 'functional-virl'
 
 - job-template:
-    name: 'csit-vpp-{functionality}'
+    name: 'csit-vpp-functional-virl'
 
     project-type: freestyle
-    node: verify
+    node: verify_merge
     concurrent: false
 
     logrotate:
@@ -23,47 +22,18 @@
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
-    parameters:
-        - project-parameter:
-            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}'
-        # - jclouds:
-        #     instances:
-        #         - multi-link:
-        #             cloud-name: 'Primary'
-        #             count: 3
-        #             stop-on-terminate: False
-
-    # TODO: Rewrite following trigger. Whis job has to be triggered by
-    # VPP verification build. This job requires built VPP DEBs.
-    # Until CSIT is fully integrated with VIRL & HW lab, trigger this build by
-    # csit patch submit.
-    triggers:
-        - gerrit-trigger-patch-submitted:
-            name: '{project}'
-            branch: '{branch}'
-
 
     builders:
-        # This is where we will need to insert a step with a script that pulls all the
-        # allocated IP addresses and injecting as vars into the env. (see Opendaylight script: include-raw-integration-get-slave-addresses.sh
-        # See jjb/integration from ODL
         - shell:
             !include-raw-escape include-raw-csit-vpp-functional-virl.sh
 

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 1be239c..bc9a545 100644 (file)
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -104,6 +104,8 @@ projects:
   - name: csit
     csit-manual-perf:
       - csit-vpp-functional-hw-tb2
+    check:
+      - csit-vpp-functional-virl
 
 #  - name: honeycomb
 #    template: