Merge "Make test-integration to rebase before build"

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

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index 4fa342c7016d924d0cd41788812dea77c9c3c6dc..8775f275217b71832ef0d13f0a66d39f48b0c6bb 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -114,6 +114,9 @@
                     comment-contains-value: 'recheck'
                 - comment-added-contains-event:
                     comment-contains-value: 'reverify'
+            override-votes: true
+            gerrit-build-unstable-verified-value: +1
+            gerrit-build-unstable-codereview-value: 0
             projects:
               - project-compare-type: 'ANT'
                 project-pattern: '{name}'
@@ -156,7 +159,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
@@ -177,7 +180,8 @@
     name: integration-get-slave-addresses
     builders:
         - shell:
-            !include-raw include-raw-integration-get-slave-addresses.sh
+            !include-raw:
+                - include-raw-integration-get-slave-addresses.sh
 
 # Macro: integration-get-bundle-vars
 # Operation: this macro gets all bundle related variables
@@ -187,17 +191,41 @@
     name: integration-get-bundle-vars
     builders:
         - shell:
-            !include-raw include-raw-integration-get-bundle-vars.sh
+            !include-raw:
+                - include-raw-integration-get-bundle-vars.sh
+
+# Macro: integration-deploy-controller-verify
+# Operation: this macro deploys the controller with all fetures
+# Used by: integration-distrbution-deploy-{stream} job template
+
+- builder:
+    name: integration-deploy-controller-verify
+    builders:
+        - shell:
+            !include-raw:
+                - include-raw-integration-deploy-controller-verify.sh
+
+# Macro: integration-deploy-controller-offline
+# Operation: this macro deploys the controller with no external repo configuration
+# Used by: integration-distrbution-offline-{stream} job template
+
+- builder:
+    name: integration-deploy-controller-offline
+    builders:
+        - shell:
+            !include-raw:
+                - include-raw-integration-deploy-controller-offline.sh
 
 # Macro: integration-deply-controller-run-test
-# Operation: this macro deployes single contoller and runs test
+# Operation: this macro deploys single contoller and runs test
 # Used by: {project}-csit-1node-* job templates
 
 - builder:
     name: integration-deploy-controller-run-test
     builders:
         - shell:
-            !include-raw include-raw-integration-deploy-controller-run-test.sh
+            !include-raw:
+                - include-raw-integration-deploy-controller-run-test.sh
 
 # Macro: integration-deploy-controller
 # Operation: this macro prepares 3-node cluster controller
@@ -207,7 +235,8 @@
     name: integration-deploy-controller
     builders:
         - shell:
-            !include-raw include-raw-integration-deploy-controller.sh
+            !include-raw:
+                - include-raw-integration-deploy-controller.sh
 
 # Macro: integration-configure-clustering
 # Operation: this macro configures the clustering
@@ -217,7 +246,8 @@
     name: integration-configure-clustering
     builders:
         - shell:
-            !include-raw include-raw-integration-configure-clustering.sh
+            !include-raw:
+                - include-raw-integration-configure-clustering.sh
 
 # Macro: integration-start-cluster-run-test
 # Operation: this macro starts the 3-node cluster and runs test
@@ -227,27 +257,84 @@
     name: integration-start-cluster-run-test
     builders:
         - shell:
-            !include-raw include-raw-integration-start-cluster-run-test.sh
+            !include-raw:
+                - include-raw-integration-start-cluster-run-test.sh
 
-# Macro: integration-deploy-controller-offline
-# Operation: this macro deployes the controller with no external repo configuration
-# Used by: integration-distrbution-offline-{stream} job template
+# Macro: integration-get-bundle-url
+# Operation: this macro gets the job generated distribution URL from distribution pom.xml
+# Used by: integration-patch-test-{stream} job template
 
 - builder:
-    name: integration-deploy-controller-offline
+    name: integration-get-bundle-url
     builders:
         - shell:
-            !include-raw include-raw-integration-deploy-controller-offline.sh
+            !include-raw:
+                - include-raw-integration-get-bundle-url.sh
 
-# Macro: integration-get-bundle-url
-# Operation: this macro gets the distribution bundle URL
-# Used by: integration-patch-test-{stream} job template
+# 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
+    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
+
+# Macro: integration-multipatch-builder
+# Operation: checks out multiple patches and builds custom distribution
+# Used by: integration-multipatch-test-* job templates
+
+- builder:
+    name: integration-multipatch-builder
+    builders:
+        - shell:
+            !include-raw:
+                - include-raw-integration-multipatch-distribution-test.sh
+
+# Macro: integration-cleanup-worspace
+# Operation: Cleans up files possibly left there by the previous build
+# Used by: {project}-csit-* job templates
+
+- builder:
+    name: integration-cleanup-workspace
+    builders:
+        - shell:
+            !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-get-bundle-url.sh
+            !include-raw include-raw-integration-rebase-gerrit-patch.sh
 
 ##############
 # Publishers #