Adding our CSIT + Verify + fixing macro

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

diff --git a/jjb/integration/integration-csit-basic-master.yaml b/jjb/integration/integration-csit-basic-master.yaml
new file mode 100644 (file)
index 0000000..b2735dd
--- /dev/null
+++ b/jjb/integration/integration-csit-basic-master.yaml
@@ -0,0 +1,31 @@
+- project:
+    name: integration-csit-basic-master
+    jobs:
+        - '{project}-csit-1node-imds-{functionality}-{install}-{stream}'
+        - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
+        - '{project}-csit-verify-{functionality}-{stream}'
+
+    # The project name
+    project: 'integration'
+
+    # The functionality under test
+    functionality: 'basic'
+
+    # Project branches
+    stream:
+        - master:
+            branch: 'master'
+
+    install:
+        - all:
+            scope: 'all'
+
+    # Features to install
+    install-features: 'odl-restconf'
+
+    # Robot custom options
+    robot-options: ''
+
+    # Trigger jobs (upstream dependencies)
+    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream},aaa-distribution-{stream},l2switch-distribution-{stream},ovsdb-distribution-{stream},vtn-distribution-{stream},lispflowmapping-distribution-{stream},integration-distribution-merge-{stream}'
+

diff --git a/jjb/integration/integration-csit-basic-stable-helium.yaml b/jjb/integration/integration-csit-basic-stable-helium.yaml
new file mode 100644 (file)
index 0000000..cb141d9
--- /dev/null
+++ b/jjb/integration/integration-csit-basic-stable-helium.yaml
@@ -0,0 +1,30 @@
+- project:
+    name: integration-csit-basic-stable-helium
+    jobs:
+        - '{project}-csit-1node-imds-{functionality}-{install}-{stream}'
+        - '{project}-csit-verify-{functionality}-{stream}'
+
+    # The project name
+    project: 'integration'
+
+    # The functionality under test
+    functionality: 'basic'
+
+    # Project branches
+    stream:
+       - stable-helium:
+            branch: 'stable/helium'
+
+    install:
+        - all:
+            scope: 'all'
+
+    # Features to install
+    install-features: 'odl-restconf'
+
+    # Robot custom options
+    robot-options: ''
+
+    # Trigger jobs (upstream dependencies)
+    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream},aaa-distribution-{stream},l2switch-distribution-{stream},ovsdb-distribution-{stream},vtn-distribution-{stream},lispflowmapping-distribution-{stream},integration-distribution-merge-{stream}'
+

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index 293ce27d8dd2ed6c91b2b6dbccbf5c8e23ddfb8f..3906c78f7d9c818144659044429a1b92a44c3edb 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/csit/{project}/**'
+                    pattern: 'test/csit/suites/{project}/**'
 
 - trigger:
     name: integration-test-gerrit-trigger-patch-merged