X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-macros.yaml;h=d43905b74e962704c9f7f7e91ceb640f55decef6;hb=755df2529e71a80299c0036b61eb5464d40133a3;hp=d3b0ce2552d6606e9b30ad9dfef9c7e38afcc29d;hpb=8e5a5faf2f701f63ce87760b78e48168fbd3b0ab;p=releng%2Fbuilder.git

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index d3b0ce255..d43905b74 100644
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -14,6 +14,14 @@
             default: '{bundleurl}'
             description: 'URL to karaf distribution zip'
 
+- parameter:
+    name: integration-jdk-version
+    parameters:
+        - string:
+            name: JDKVERSION
+            default: '{jdkversion}'
+            description: 'Parameter to indicate JAVA Version'
+
 - parameter:
     name: integration-controller-scope
     parameters:
@@ -30,13 +38,29 @@
             default: '{controller-features}'
             description: 'Features to install in the controller separated by comma'
 
+- parameter:
+    name: integration-distribution-stream
+    parameters:
+        - string:
+            name: DISTROSTREAM
+            default: '{stream}'
+            description: 'Distribution stream string, for suites to know which behavior to expect'
+
+- parameter:
+    name: integration-stream-test-plan
+    parameters:
+        - string:
+            name: STREAMTESTPLAN
+            default: '{stream-test-plan}'
+            description: 'Stream-specific test plan we will run'
+
 - parameter:
     name: integration-test-plan
     parameters:
         - string:
             name: TESTPLAN
             default: '{test-plan}'
-            description: 'Test plan we will run'
+            description: 'General test plan we will run unless stream-specific one is found'
 
 - parameter:
     name: integration-test-options
@@ -150,6 +174,26 @@
                   - compare-type: 'ANT'
                     pattern: '{pattern}'
 
+# Macro: integration-csit-only
+# Operation: this macro sets a trigger on reverse job list
+# Used by: csit -only- job templates
+
+- trigger:
+    name: integration-csit-only
+    triggers:
+        - reverse:
+            jobs: '{jobs}'
+            result: 'success'
+
+# Macro: integration-csit-all
+# Operation: this macro sets a periodic trigger
+# Used by: csit -all- job teamplates
+
+- trigger:
+    name: integration-csit-all
+    triggers:
+        - timed: 'H H * * *'
+
 # Macro: integration-jclouds-controller-mininet
 # Operation: this macro will spin the controller and mininet vms
 # Used by: {project}-csit-* job templates
@@ -168,6 +212,23 @@
                 count: '{mininet-vms}'
                 stop-on-terminate: False
 
+# Macro: integration-jclouds-controller-devstack
+# Operation: this macro will spin the controller and devstack vms
+# Used by: {project}-csit-openstack job templates
+- wrapper:
+    name: integration-jclouds-controller-devstack
+    wrappers:
+      - jclouds:
+          instances:
+            - rk-c7-java:
+                cloud-name: 'Rackspace DFW - Integration Dynamic Lab'
+                count: '{controller-vms}'
+                stop-on-terminate: False
+            - rk-c7-devstack:
+                cloud-name: 'Rackspace DFW - Devstack'
+                count: '{openstack-vms}'
+                stop-on-terminate: False
+
 #################
 # Shell Scripts #
 #################
@@ -194,9 +255,20 @@
             !include-raw:
                 - include-raw-integration-get-bundle-vars.sh
 
+# Macro: integration-distribution-check
+# Operation: this macro deploys the controller with all fetures
+# Used by: {project}-distribution-check-{stream} job template
+
+- builder:
+    name: integration-distribution-check
+    builders:
+        - shell:
+            !include-raw:
+                - include-raw-integration-distribution-check.sh
+
 # Macro: integration-deploy-controller-verify
 # Operation: this macro deploys the controller with all fetures
-# Used by: integration-distrbution-deploy-{stream} job template
+# Used by: integration-distribution-deploy-{stream} job template
 
 - builder:
     name: integration-deploy-controller-verify
@@ -227,16 +299,16 @@
             !include-raw:
                 - include-raw-integration-deploy-controller-run-test.sh
 
-# Macro: integration-deploy-controller
-# Operation: this macro prepares 3-node cluster controller
-# Used by: {project}-csit-3node-* job templates
+# Macro: include-raw-integration-deploy-robot-testing
+# Operation: this macro only resolves suite path from testplan
+# Used by: {project}-openstack-{functionality}-daily-{openstack}-{odl} job templates
 
 - builder:
-    name: integration-deploy-controller
+    name: include-raw-integration-deploy-devstack-testing
     builders:
         - shell:
             !include-raw:
-                - include-raw-integration-deploy-controller.sh
+                - include-raw-integration-deploy-devstack-testing.sh
 
 # Macro: integration-configure-clustering
 # Operation: this macro configures the clustering
@@ -326,6 +398,23 @@
             !include-raw:
                 - include-raw-integration-cleanup-workspace.sh
 
+# Macro: integration-rebase-patch
+# Operation: For cloned project, rebase checked-out Gerrit patch onto $BRANCH.
+# Used by: integration-patch-distribution-* job template
+
+- builder:
+    name: integration-rebase-gerrit-patch
+    builders:
+        - shell:
+            !include-raw:
+                - include-raw-integration-rebase-gerrit-patch.sh
+
+- builder:
+    name: integration-deploy-openstack-run-test
+    builders:
+        - shell:
+            !include-raw:
+                - include-raw-integration-deploy-openstack-run-test.sh
 ##############
 # Publishers #
 ##############