Merge "Add BUNDLE_URL Robot variable definition"

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

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 08301991237b46a975273deb4ff8de65aa0dc5af..4426e6b290a010111ec728bfb608a535aee807a6 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -29,8 +29,7 @@
 
 - job-template:
     name: '{project}-csit-verify-1node-{functionality}-{stream}'
-    # Temporarily disable csit job until Rackspace networking issues are solved
-    disabled: true
+    disabled: false
 
     project-type: freestyle
     node: dynamic_robot
@@ -57,7 +56,7 @@
         - integration-test-plan:
             test-plan: '{project}-{functionality}.txt'
         - integration-jdk-version:
-            jdkversion: 'openjdk7'
+            jdkversion: '{jdk}'
 
     scm:
         - integration-gerrit-scm:
@@ -108,8 +107,7 @@
 
 - job-template:
     name: '{project}-csit-1node-imds-{functionality}-{install}-{stream}'
-    # Temporarily disable csit job until Rackspace networking issues are solved
-    disabled: true
+    disabled: false
 
     project-type: freestyle
     node: dynamic_robot
@@ -138,7 +136,7 @@
         - integration-patch-refspec:
             branch: 'stable/helium'
         - integration-jdk-version:
-            jdkversion: 'openjdk7'
+            jdkversion: '{jdk}'
 
     scm:
         - integration-gerrit-scm:
@@ -217,8 +215,7 @@
 
 - job-template:
     name: '{project}-csit-verify-1node-{functionality}'
-    # Temporarily disable csit job until Rackspace networking issues are solved
-    disabled: true
+    disabled: false
 
     project-type: freestyle
     node: dynamic_robot
@@ -233,7 +230,7 @@
         - project-parameter:
             project: 'integration/test'
         - integration-branch:
-            branch: 'master'
+            branch: 'stable/beryllium'
         - integration-bundleurl:
             bundleurl: 'last'
         - integration-controller-scope:
@@ -245,7 +242,8 @@
         - integration-test-plan:
             test-plan: '{project}-{functionality}.txt'
         - integration-jdk-version:
-            jdkversion: 'openjdk7'
+            # Here {jdk} is taken from releng-defaults.yaml
+            jdkversion: '{jdk}'
 
     scm:
         - integration-gerrit-scm:
@@ -296,8 +294,7 @@
 
 - job-template:
     name: '{project}-csit-1node-{functionality}-{install}-{stream}'
-    # Temporarily disable csit job until Rackspace networking issues are solved
-    disabled: true
+    disabled: false
 
     project-type: freestyle
     node: dynamic_robot
@@ -326,7 +323,7 @@
         - integration-patch-refspec:
             branch: 'master'
         - integration-jdk-version:
-            jdkversion: 'openjdk7'
+            jdkversion: '{jdk}'
 
     scm:
         - integration-gerrit-scm:
@@ -400,8 +397,7 @@
 
 - job-template:
     name: '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
-    # Temporarily disable csit job until Rackspace networking issues are solved
-    disabled: true
+    disabled: false
 
     project-type: freestyle
     node: dynamic_robot
@@ -430,7 +426,7 @@
         - integration-patch-refspec:
             branch: 'master'
         - integration-jdk-version:
-            jdkversion: 'openjdk7'
+            jdkversion: '{jdk}'
 
     scm:
         - integration-gerrit-scm:
@@ -502,8 +498,7 @@
 
 - job-template:
     name: '{project}-csit-verify-3node-{functionality}'
-    # Temporarily disable csit job until Rackspace networking issues are solved
-    disabled: true
+    disabled: false
 
     project-type: freestyle
     node: dynamic_robot
@@ -518,7 +513,7 @@
         - project-parameter:
             project: 'integration/test'
         - integration-branch:
-            branch: 'master'
+            branch: 'stable/beryllium'
         - integration-bundleurl:
             bundleurl: 'last'
         - integration-controller-scope:
@@ -530,7 +525,7 @@
         - integration-test-plan:
             test-plan: '{project}-{functionality}.txt'
         - integration-jdk-version:
-            jdkversion: 'openjdk7'
+            jdkversion: '{jdk}'
 
     scm:
         - integration-gerrit-scm:
@@ -583,8 +578,7 @@
 
 - job-template:
     name: '{project}-csit-3node-{functionality}-{install}-{stream}'
-    # Temporarily disable csit job until Rackspace networking issues are solved
-    disabled: true
+    disabled: false
 
     project-type: freestyle
     node: dynamic_robot
@@ -613,7 +607,7 @@
         - integration-patch-refspec:
             branch: 'master'
         - integration-jdk-version:
-            jdkversion: 'openjdk7'
+            jdkversion: '{jdk}'
 
     scm:
         - integration-gerrit-scm:
@@ -689,8 +683,7 @@
 
 - job-template:
     name: '{project}-csit-3node-periodic-{functionality}-{install}-{stream}'
-    # Temporarily disable csit job until Rackspace networking issues are solved
-    disabled: true
+    disabled: false
 
     project-type: freestyle
     node: dynamic_robot
@@ -719,7 +712,7 @@
         - integration-patch-refspec:
             branch: 'master'
         - integration-jdk-version:
-            jdkversion: 'openjdk7'
+            jdkversion: '{jdk}'
 
     scm:
         - integration-gerrit-scm: