Adding Verify CSIT job template

Change-Id: I871da497e7b6af3aa9cc2b2fc547c0b00a3fbabd
Signed-off-by: Luis Gomez <ecelgp@gmail.com>

diff --git a/jjb/integration/integration-csit.yaml b/jjb/integration/integration-csit.yaml
index c690f27c28d4ef9650b20c415d1641798c80c971..8e497a0a39c837fa8c34631637d404e1fa9c3e84 100644 (file)
--- a/jjb/integration/integration-csit.yaml
+++ b/jjb/integration/integration-csit.yaml
@@ -1,3 +1,66 @@
+- job-template:
+    name: '{project}-csit-verify-{functionality}-{stream}'
+
+    project-type: freestyle
+    node: dynamic_robot
+
+    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: 'integration'
+        - integration-branch:
+            branch: '{branch}'
+        - integration-bundleurl:
+            bundleurl: 'last'
+        - integration-controller-scope:
+            controller-scope: 'only'
+        - integration-controller-features:
+            controller-features: '{install-features}'
+        - integration-test-options:
+            test-options: '{robot-options}'
+        - integration-test-plan:
+            test-plan: '{project}-{functionality}.txt'
+
+    scm:
+        - gerrit-trigger-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: '$GERRIT_REFSPEC'
+            choosing-strategy: 'gerrit'
+
+    wrappers:
+        - build-timeout
+        - integration-jclouds-controller-mininet:
+            controller-vms: 1
+            mininet-vms: 1
+        - ssh-agent-credentials:
+            user: '{ssh-credentials}'
+
+    triggers:
+        - integration-test-gerrit-trigger-patch-submitted:
+            name: 'integration'
+            branch: '{branch}'
+            project: '{project}'
+
+    builders:
+        - integration-get-slave-addresses
+        - inject:
+            properties-file: 'slave_addresses.txt'
+        - integration-deploy-controller-run-test
+
+    publishers:
+        - integration-robot:
+            unstable-if: 97.0
+            pass-if: 100.0
+        - archive:
+            artifacts: 'karaf.log'
+        - email-notification:
+            email-prefix: '[{project}]'
+
 - job-template:
     name: '{project}-csit-1node-imds-{functionality}-{install}-{stream}'
 

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index 48c63d51f65c81c3bd88d531eea594c7fad7fa48..293ce27d8dd2ed6c91b2b6dbccbf5c8e23ddfb8f 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -121,7 +121,7 @@
                     branch-pattern: '**/{branch}'
                 file-paths:
                   - compare-type: 'ANT'
-                    pattern: 'test/**'
+                    pattern: 'test/csit/{project}/**'
 
 - trigger:
     name: integration-test-gerrit-trigger-patch-merged