Use maven-3.8 for Sonar jobs

[releng/builder.git] / jjb / infrautils / infrautils.yaml

diff --git a/jjb/infrautils/infrautils.yaml b/jjb/infrautils/infrautils.yaml
index bdfede3dd9956a023ccfa91ebd9d2b0444539ef1..d604430b77aea3805e6db5c55a71fb1b01ddd933 100644 (file)
--- a/jjb/infrautils/infrautils.yaml
+++ b/jjb/infrautils/infrautils.yaml
@@ -10,6 +10,7 @@
           rtd-token: 294c76173237e3a088365c31012cf4ddaa767dc9
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
+      - odl-maven-verify-jobs-jdk17
 
     stream: master
     project: "infrautils"
@@ -17,6 +18,7 @@
     branch: "master"
     java-version: "openjdk11"
     mvn-settings: "infrautils-settings"
+    build-node: centos8-builder-4c-4g
     dependencies: "odlparent-merge-{stream}"
     email-upstream: "[infrautils] [odlparent]"
 
@@ -24,7 +26,7 @@
     staging-profile-id: 96fca0367756c
 
 - project:
-    name: infrautils-1.9.x
+    name: infrautils-2.0.x
     jobs:
       - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
@@ -35,10 +37,10 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: 1.9.x
+    stream: 2.0.x
     project: "infrautils"
     project-name: "infrautils"
-    branch: "1.9.x"
+    branch: "2.0.x"
     java-version: "openjdk11"
     mvn-settings: "infrautils-settings"
     dependencies: "odlparent-merge-{stream}"
@@ -48,7 +50,7 @@
     staging-profile-id: 96fca0367756c
 
 - project:
-    name: infrautils-1.8.x
+    name: infrautils-1.9.x
     jobs:
       - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
@@ -59,13 +61,12 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: aluminium
+    stream: 1.9.x
     project: "infrautils"
     project-name: "infrautils"
-    branch: "1.8.x"
+    branch: "1.9.x"
     java-version: "openjdk11"
     mvn-settings: "infrautils-settings"
-    mvn-opts: "-Xmx1024m"
     dependencies: "odlparent-merge-{stream}"
     email-upstream: "[infrautils] [odlparent]"
 
@@ -101,6 +102,7 @@
     project-name: "infrautils"
     branch: "master"
     java-version: "openjdk11"
+    mvn-version: mvn38
     mvn-settings: "infrautils-settings"
     mvn-opts: "-Xmx1024m"
     sonarcloud: true