Update mdsal jobs for 2024.09 Scandium

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

diff --git a/jjb/infrautils/infrautils.yaml b/jjb/infrautils/infrautils.yaml
index d8f2a59fc0693e7a9e1241c162f5ad6dbb98b0b3..40f2718c95202c37bcd396b31212ac42772ae8fd 100644 (file)
--- a/jjb/infrautils/infrautils.yaml
+++ b/jjb/infrautils/infrautils.yaml
@@ -3,46 +3,22 @@
     name: infrautils-master
     jobs:
       - "{project-name}-rtd-jobs":
-          build-node: centos7-builder-2c-2g
+          build-node: ubuntu2004-docker-2c-2g
           doc-dir: .tox/docs/tmp/html
           project-pattern: infrautils
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-infrautils/38993/
           rtd-token: 294c76173237e3a088365c31012cf4ddaa767dc9
-      - odl-maven-jobs-jdk17
-      - odl-maven-verify-jobs-jdk17
+      - odl-maven-jobs-jdk21
+      - odl-maven-verify-jobs-jdk21
 
+    project: infrautils
+    project-name: infrautils
     stream: master
-    project: "infrautils"
-    project-name: "infrautils"
     branch: master
-    java-version: "openjdk17"
-    mvn-settings: "infrautils-settings"
-    build-node: centos8-builder-4c-4g
-    dependencies: "odlparent-merge-{stream}"
-    email-upstream: "[infrautils] [odlparent]"
-
-    # Used by the release job
-    staging-profile-id: 96fca0367756c
-
-- project:
-    name: infrautils-5.0.x
-    jobs:
-      - "{project-name}-rtd-jobs":
-          build-node: centos7-builder-2c-2g
-          doc-dir: .tox/docs/tmp/html
-          project-pattern: infrautils
-          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-infrautils/38993/
-          rtd-token: 294c76173237e3a088365c31012cf4ddaa767dc9
-      - odl-maven-jobs-jdk17
-      - odl-maven-verify-jobs-jdk17
+    build-node: ubuntu2004-docker-2c-2g
 
-    stream: 5.0.x
-    project: "infrautils"
-    project-name: "infrautils"
-    branch: 5.0.x
-    java-version: "openjdk17"
     mvn-settings: "infrautils-settings"
-    build-node: centos8-builder-4c-4g
+
     dependencies: "odlparent-merge-{stream}"
     email-upstream: "[infrautils] [odlparent]"
 
@@ -50,24 +26,26 @@
     staging-profile-id: 96fca0367756c
 
 - project:
-    name: infrautils-4.0.x
+    name: infrautils-6.0.x
     jobs:
       - "{project-name}-rtd-jobs":
-          build-node: centos7-builder-2c-2g
+          build-node: ubuntu2004-docker-2c-2g
           doc-dir: .tox/docs/tmp/html
           project-pattern: infrautils
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-infrautils/38993/
           rtd-token: 294c76173237e3a088365c31012cf4ddaa767dc9
       - odl-maven-jobs-jdk17
       - odl-maven-verify-jobs-jdk17
+      - odl-maven-verify-jobs-jdk21
+
+    project: infrautils
+    project-name: infrautils
+    stream: 6.0.x
+    branch: 6.0.x
+    build-node: ubuntu2004-docker-2c-2g
 
-    stream: 4.0.x
-    project: "infrautils"
-    project-name: "infrautils"
-    branch: "4.0.x"
-    java-version: "openjdk17"
     mvn-settings: "infrautils-settings"
-    build-node: centos8-builder-4c-4g
+
     dependencies: "odlparent-merge-{stream}"
     email-upstream: "[infrautils] [odlparent]"
 
@@ -91,7 +69,7 @@
 - project:
     name: infrautils-sonar
     jobs:
-      - gerrit-maven-sonar:
+      - odl-sonar-jobs-jdk21:
           mvn-params: >
             -Dodl.jacoco.aggregateFile=$WORKSPACE/target/jacoco.exec
             -Dskip.karaf.featureTest=true
@@ -102,14 +80,9 @@
     project: "infrautils"
     project-name: "infrautils"
     branch: "master"
-    java-version: "openjdk17"
-    mvn-version: mvn38
+    build-node: ubuntu2004-docker-2c-2g
+
     mvn-settings: "infrautils-settings"
-    build-node: centos8-builder-4c-4g
-    sonarcloud: true
-    sonarcloud-project-organization: "{sonarcloud_project_organization}"
-    sonarcloud-api-token: "{sonarcloud_api_token}"
-    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
 
 - project:
     name: infrautils-info