X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fcsit%2Fcsit-vpp-functional.yaml;h=7e1ff5c6ff5a0160f04dab4b77e6e0ae927ee2c6;hb=refs%2Fchanges%2F03%2F1003%2F2;hp=1227aa65dc0fb6c4b9add688d1053cf0f7507ecd;hpb=d9f89c12bb44c90eb6afdd0a4ade3192b319cf35;p=ci-management.git

diff --git a/jjb/csit/csit-vpp-functional.yaml b/jjb/csit/csit-vpp-functional.yaml
index 1227aa65d..7e1ff5c6f 100644
--- a/jjb/csit/csit-vpp-functional.yaml
+++ b/jjb/csit/csit-vpp-functional.yaml
@@ -3,19 +3,21 @@
     description: 'Run VPP functional tests on VIRL.'
 
     jobs:
-        - 'csit-vpp-{functionality}'
+        - 'csit-vpp-perf-hw-{type}'
+        - 'csit-vpp-functional-virl'
+        - 'csit-vpp-master-verify-weekly'
 
     project: 'csit'
     branch: 'master'
-
-    functionality: 'functional-virl'
+    type:
+        - all
 
 - job-template:
-    name: 'csit-vpp-{functionality}'
+    name: 'csit-vpp-functional-virl'
 
     project-type: freestyle
     node: verify
-    concurrent: false
+    concurrent: true
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -28,10 +30,6 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
-        - string:
-            name: 'VPP_URLS'
-            default: ''
-            description: 'Space separated VPP *.deb URLs from nexus'
 
     scm:
         - gerrit-trigger-scm:
@@ -43,27 +41,13 @@
         - 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
 
@@ -72,13 +56,14 @@
             artifacts: 'report.html, log.html, output.xml'
             latest-only: false
 
-        - robot-report
+        - robot-report:
+            output-path: ''
 
-- job:
-    name: 'csit-vpp-functional-hw-tb2'
+- job-template:
+    name: 'csit-vpp-perf-hw-{type}'
 
     project-type: freestyle
-    node: verify_merge
+    node: verify
     concurrent: false
 
     logrotate:
@@ -92,25 +77,102 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
+        - type-parameter:
+            type: '{type}'
 
     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: 'verify-perf-{type}'
+
     builders:
         - shell:
-            !include-raw-escape jjb/csit/include-raw-csit-vpp-functional-hw-tb2.sh
+            !include-raw-escape jjb/csit/include-raw-csit-vpp-perf-hw.sh
 
     publishers:
         - archive-artifacts:
             artifacts: 'report.html, log.html, output.xml'
             latest-only: false
 
-        - robot-report
+        - robot-report:
+            output-path: ''
+
+- job-template:
+    name: 'csit-vpp-master-verify-weekly'
+
+    project-type: freestyle
+    node: verify
+    concurrent: false
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            branch: 'master'
+
+    wrappers:
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - timed: 'H H * * 0'
+
+        - gerrit-trigger-manually-triggered:
+            comment-trigger-value: 'csit-weekly-verify'
+            name: '{project}'
+            branch: '{branch}'
+
+    builders:
+        - shell:
+            !include-raw-escape jjb/csit/include-raw-csit-vpp-verify-master.sh
+
+    publishers:
+        - archive-artifacts:
+            artifacts: 'report.html, log.html, output.xml'
+            latest-only: false
+
+        - robot-report:
+            output-path: ''
+
+        - git:
+               push-only-if-success: true
+               tags:
+                   - tag:
+                       remote: origin
+                       name: "csit-verified"
+                       message: "Verified CSIT version for VPP testing"
+                       create-tag: true
+                       update-tag: true
+
+- parameter:
+    name: test-type-parameter
+
+    parameters:
+        - string:
+            name: TYPE
+            default: '{type}'
+            description: "Test TYPE parameter if not given by trigger"