Merge "Add stable/lithium and verify in the OpenFlow cluster test"

[releng/builder.git] / jjb / integration / integration-macros.yaml

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index 4fa342c7016d924d0cd41788812dea77c9c3c6dc..78d3b0561288be4075e8174c2655584e6f1534bd 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -156,7 +156,7 @@
     wrappers:
       - jclouds:
           instances:
-            - rk-c-el6-java:
+            - rk-c7-java:
                 cloud-name: 'Rackspace DFW - Integration Dynamic Lab'
                 count: '{controller-vms}'
                 stop-on-terminate: False
@@ -240,7 +240,7 @@
             !include-raw include-raw-integration-deploy-controller-offline.sh
 
 # Macro: integration-get-bundle-url
-# Operation: this macro gets the distribution bundle URL
+# Operation: this macro gets the job generated distribution URL from distribution pom.xml
 # Used by: integration-patch-test-{stream} job template
 
 - builder:
@@ -249,6 +249,37 @@
         - shell:
             !include-raw include-raw-integration-get-bundle-url.sh
 
+# Macro: integration-get-bundle-url-root
+# Operation: this macro gets the job generated distribution URL from root pom.xml
+# Used by: integration-distribution-verify-{stream} job template
+
+- builder:
+    name: integration-get-bundle-url-root
+    builders:
+        - shell:
+            !include-raw include-raw-integration-get-bundle-url-root.sh
+
+# Macro: integration-install-robotframework
+# Operation: Installs robotframework using pip to a virtualenv
+# Used by: {project}-csit-* job templates
+
+- builder:
+    name: integration-install-robotframework
+    builders:
+        - shell:
+            !include-raw include-raw-integration-install-robotframework.sh
+
+# Macro: integration-cleanup-tmp
+# Operation: Cleans up temporary files created by build
+# Used by: {project}-csit-* job templates
+
+- builder:
+    name: integration-cleanup-tmp
+    builders:
+        - shell:
+            !include-raw include-raw-integration-cleanup-tmp.sh
+
+
 ##############
 # Publishers #
 ##############