Build integration-test with Java 17

Rework the defines here to default to mvn38/openjdk17 and provide
overrides for older versions.

Change-Id: I163db9397f3f7d019225e89d1f885d361a5df736
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index 1bebf9bef8cc3beabcbafe01726b137f3d18bdc8..16d28d194168296a39eeb3ed9d9e8c86a97cd072 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -17,12 +17,13 @@
           stream: master
           build-node: centos7-builder-2c-2g
 
+    mvn-version: "mvn38"
+    java-version: "openjdk17"
+
     # CSIT Lists in defaults.yaml
     stream:
       - chlorine:
           branch: "master"
-          mvn-version: "mvn38"
-          java-version: "openjdk11"
           csit-list: !include: csit-jobs-chlorine.lst
           build-order: >
             odlparent infrautils yangtools mdsal controller aaa netconf bgpcep
@@ -31,7 +32,6 @@
 
       - sulfur:
           branch: "stable/sulfur"
-          mvn-version: "mvn38"
           java-version: "openjdk11"
           csit-list: !include: csit-jobs-sulfur.lst
           build-order: >