csit-verify: Do not change Java version

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

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index eb13c97684f927baf546eff8dfbded7abdd9c6e4..3a4cade5e483d081b99f91ebc3a10e8eb37c94d4 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -29,6 +29,7 @@
 
 - job-template:
     name: '{project}-csit-verify-1node-{functionality}-{stream}'
+    disabled: false
 
     project-type: freestyle
     node: dynamic_robot
@@ -54,6 +55,8 @@
             test-options: '{robot-options}'
         - integration-test-plan:
             test-plan: '{project}-{functionality}.txt'
+        - integration-jdk-version:
+            jdkversion: '{jdk}'
 
     scm:
         - integration-gerrit-scm:
@@ -104,6 +107,7 @@
 
 - job-template:
     name: '{project}-csit-1node-imds-{functionality}-{install}-{stream}'
+    disabled: false
 
     project-type: freestyle
     node: dynamic_robot
@@ -131,6 +135,8 @@
             test-plan: '{project}-{functionality}.txt'
         - integration-patch-refspec:
             branch: 'stable/helium'
+        - integration-jdk-version:
+            jdkversion: '{jdk}'
 
     scm:
         - integration-gerrit-scm:
@@ -150,10 +156,10 @@
             users:
                 - '{ssh-credentials}'
 
+
     triggers:
-        - reverse:
+        - integration-csit-{install}:
             jobs: '{trigger-jobs}'
-            result: 'success'
 
     builders:
         - integration-cleanup-workspace
@@ -209,6 +215,7 @@
 
 - job-template:
     name: '{project}-csit-verify-1node-{functionality}'
+    disabled: false
 
     project-type: freestyle
     node: dynamic_robot
@@ -223,7 +230,7 @@
         - project-parameter:
             project: 'integration/test'
         - integration-branch:
-            branch: 'master'
+            branch: 'stable/beryllium'
         - integration-bundleurl:
             bundleurl: 'last'
         - integration-controller-scope:
@@ -234,6 +241,7 @@
             test-options: '{robot-options}'
         - integration-test-plan:
             test-plan: '{project}-{functionality}.txt'
+        # TODO: Use integration-jdk-version macro when switching to Boron
 
     scm:
         - integration-gerrit-scm:
@@ -284,6 +292,7 @@
 
 - job-template:
     name: '{project}-csit-1node-{functionality}-{install}-{stream}'
+    disabled: false
 
     project-type: freestyle
     node: dynamic_robot
@@ -311,6 +320,8 @@
             test-plan: '{project}-{functionality}.txt'
         - integration-patch-refspec:
             branch: 'master'
+        - integration-jdk-version:
+            jdkversion: '{jdk}'
 
     scm:
         - integration-gerrit-scm:
@@ -331,9 +342,8 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - reverse:
+        - integration-csit-{install}:
             jobs: '{trigger-jobs}'
-            result: 'success'
 
     builders:
         - integration-cleanup-workspace
@@ -385,6 +395,7 @@
 
 - job-template:
     name: '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
+    disabled: false
 
     project-type: freestyle
     node: dynamic_robot
@@ -412,6 +423,8 @@
             test-plan: '{project}-{functionality}.txt'
         - integration-patch-refspec:
             branch: 'master'
+        - integration-jdk-version:
+            jdkversion: '{jdk}'
 
     scm:
         - integration-gerrit-scm:
@@ -483,6 +496,7 @@
 
 - job-template:
     name: '{project}-csit-verify-3node-{functionality}'
+    disabled: false
 
     project-type: freestyle
     node: dynamic_robot
@@ -497,7 +511,7 @@
         - project-parameter:
             project: 'integration/test'
         - integration-branch:
-            branch: 'master'
+            branch: 'stable/beryllium'
         - integration-bundleurl:
             bundleurl: 'last'
         - integration-controller-scope:
@@ -508,6 +522,7 @@
             test-options: '{robot-options}'
         - integration-test-plan:
             test-plan: '{project}-{functionality}.txt'
+        # TODO: Use integration-jdk-version macro when switching to Boron
 
     scm:
         - integration-gerrit-scm:
@@ -560,6 +575,7 @@
 
 - job-template:
     name: '{project}-csit-3node-{functionality}-{install}-{stream}'
+    disabled: false
 
     project-type: freestyle
     node: dynamic_robot
@@ -587,6 +603,8 @@
             test-plan: '{project}-{functionality}.txt'
         - integration-patch-refspec:
             branch: 'master'
+        - integration-jdk-version:
+            jdkversion: '{jdk}'
 
     scm:
         - integration-gerrit-scm:
@@ -607,9 +625,8 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - reverse:
+        - integration-csit-{install}:
             jobs: '{trigger-jobs}'
-            result: 'success'
 
     builders:
         - integration-cleanup-workspace
@@ -663,6 +680,7 @@
 
 - job-template:
     name: '{project}-csit-3node-periodic-{functionality}-{install}-{stream}'
+    disabled: false
 
     project-type: freestyle
     node: dynamic_robot
@@ -690,6 +708,8 @@
             test-plan: '{project}-{functionality}.txt'
         - integration-patch-refspec:
             branch: 'master'
+        - integration-jdk-version:
+            jdkversion: '{jdk}'
 
     scm:
         - integration-gerrit-scm: