X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-templates.yaml;h=3a4cade5e483d081b99f91ebc3a10e8eb37c94d4;hb=deeed22e1fa4e36016e36889ac54e278b9bb4296;hp=08301991237b46a975273deb4ff8de65aa0dc5af;hpb=11f3c0c79f1a839ebd72627a38da746adabd80c8;p=releng%2Fbuilder.git

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 083019912..3a4cade5e 100644
--- 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:
@@ -244,8 +241,7 @@
             test-options: '{robot-options}'
         - integration-test-plan:
             test-plan: '{project}-{functionality}.txt'
-        - integration-jdk-version:
-            jdkversion: 'openjdk7'
+        # TODO: Use integration-jdk-version macro when switching to Boron
 
     scm:
         - integration-gerrit-scm:
@@ -296,8 +292,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 +321,7 @@
         - integration-patch-refspec:
             branch: 'master'
         - integration-jdk-version:
-            jdkversion: 'openjdk7'
+            jdkversion: '{jdk}'
 
     scm:
         - integration-gerrit-scm:
@@ -400,8 +395,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 +424,7 @@
         - integration-patch-refspec:
             branch: 'master'
         - integration-jdk-version:
-            jdkversion: 'openjdk7'
+            jdkversion: '{jdk}'
 
     scm:
         - integration-gerrit-scm:
@@ -502,8 +496,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 +511,7 @@
         - project-parameter:
             project: 'integration/test'
         - integration-branch:
-            branch: 'master'
+            branch: 'stable/beryllium'
         - integration-bundleurl:
             bundleurl: 'last'
         - integration-controller-scope:
@@ -529,8 +522,7 @@
             test-options: '{robot-options}'
         - integration-test-plan:
             test-plan: '{project}-{functionality}.txt'
-        - integration-jdk-version:
-            jdkversion: 'openjdk7'
+        # TODO: Use integration-jdk-version macro when switching to Boron
 
     scm:
         - integration-gerrit-scm:
@@ -583,8 +575,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 +604,7 @@
         - integration-patch-refspec:
             branch: 'master'
         - integration-jdk-version:
-            jdkversion: 'openjdk7'
+            jdkversion: '{jdk}'
 
     scm:
         - integration-gerrit-scm:
@@ -689,8 +680,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 +709,7 @@
         - integration-patch-refspec:
             branch: 'master'
         - integration-jdk-version:
-            jdkversion: 'openjdk7'
+            jdkversion: '{jdk}'
 
     scm:
         - integration-gerrit-scm: