Merge "csit-verify: Do not change Java version"

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 4426e6b290a010111ec728bfb608a535aee807a6..3a4cade5e483d081b99f91ebc3a10e8eb37c94d4 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -241,9 +241,7 @@
             test-options: '{robot-options}'
         - integration-test-plan:
             test-plan: '{project}-{functionality}.txt'
-        - integration-jdk-version:
-            # Here {jdk} is taken from releng-defaults.yaml
-            jdkversion: '{jdk}'
+        # TODO: Use integration-jdk-version macro when switching to Boron
 
     scm:
         - integration-gerrit-scm:
@@ -524,8 +522,7 @@
             test-options: '{robot-options}'
         - integration-test-plan:
             test-plan: '{project}-{functionality}.txt'
-        - integration-jdk-version:
-            jdkversion: '{jdk}'
+        # TODO: Use integration-jdk-version macro when switching to Boron
 
     scm:
         - integration-gerrit-scm: