Merge "Remove jdk11 job-groups"

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

diff --git a/jjb/serviceutils/serviceutils.yaml b/jjb/serviceutils/serviceutils.yaml
index d6e4f142bf6badfb6c1eaede8b874e4964d6528f..c543d84ffc843455ffc1150977a1d570570fdc82 100644 (file)
--- a/jjb/serviceutils/serviceutils.yaml
+++ b/jjb/serviceutils/serviceutils.yaml
@@ -1,10 +1,11 @@
 ---
 - project:
-    name: serviceutils-potassium
+    name: serviceutils-scandium
     jobs:
       - "{project-name}-distribution-check-{stream}"
       - "{project-name}-maven-javadoc-jobs":
           mvn-version: mvn38
+          java-version: openjdk17
       - "{project-name}-rtd-jobs":
           build-node: centos8-builder-2c-2g
           project-pattern: serviceutils
@@ -14,7 +15,7 @@
       - odl-maven-verify-jobs-jdk17
 
     branch: "master"
-    stream: potassium
+    stream: scandium
 
     project: "serviceutils"
     project-name: "serviceutils"
@@ -31,11 +32,12 @@
     staging-profile-id: 12cc4ba8bf01ba
 
 - project:
-    name: serviceutils-argon
+    name: serviceutils-calcium
     jobs:
       - "{project-name}-distribution-check-{stream}"
       - "{project-name}-maven-javadoc-jobs":
           mvn-version: mvn38
+          java-version: openjdk17
       - "{project-name}-rtd-jobs":
           build-node: centos8-builder-2c-2g
           project-pattern: serviceutils
@@ -44,8 +46,8 @@
       - odl-maven-jobs-jdk17
       - odl-maven-verify-jobs-jdk17
 
-    branch: "stable/argon"
-    stream: argon
+    branch: "stable/calcium"
+    stream: calcium
 
     project: "serviceutils"
     project-name: "serviceutils"
@@ -62,11 +64,12 @@
     staging-profile-id: 12cc4ba8bf01ba
 
 - project:
-    name: serviceutils-chlorine
+    name: serviceutils-potassium
     jobs:
       - "{project-name}-distribution-check-{stream}"
       - "{project-name}-maven-javadoc-jobs":
           mvn-version: mvn38
+          java-version: openjdk17
       - "{project-name}-rtd-jobs":
           build-node: centos8-builder-2c-2g
           project-pattern: serviceutils
@@ -75,8 +78,8 @@
       - odl-maven-jobs-jdk17
       - odl-maven-verify-jobs-jdk17
 
-    branch: "stable/chlorine"
-    stream: chlorine
+    branch: "stable/potassium"
+    stream: potassium
 
     project: "serviceutils"
     project-name: "serviceutils"
@@ -95,18 +98,13 @@
 - project:
     name: serviceutils-sonar
     jobs:
-      - gerrit-maven-sonar
+      - odl-sonar-jobs-jdk17
 
     project: "serviceutils"
     project-name: "serviceutils"
     branch: "master"
-    mvn-version: mvn38
     mvn-settings: "serviceutils-settings"
     mvn-opts: "-Xmx1024m"
-    sonarcloud: true
-    sonarcloud-project-organization: "{sonarcloud_project_organization}"
-    sonarcloud-api-token: "{sonarcloud_api_token}"
-    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
 
 - project:
     name: serviceutils-info