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 e960ea1910d994c298519d85a24f7737ce8e3e4a..40f2718c95202c37bcd396b31212ac42772ae8fd 100644 (file)
--- a/jjb/infrautils/infrautils.yaml
+++ b/jjb/infrautils/infrautils.yaml
@@ -3,48 +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-jdk11
-      - odl-maven-verify-jobs
+      - 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: "openjdk11"
-    mvn-settings: "infrautils-settings"
-    mvn-opts: "-Xmx1024m"
-    dependencies: "odlparent-merge-{stream}"
-    email-upstream: "[infrautils] [odlparent]"
-
-    # Used by the release job
-    staging-profile-id: 96fca0367756c
-
-- project:
-    name: infrautils-magnesium
-    jobs:
-      - "{project-name}-distribution-check-{stream}"
-      - "{project-name}-maven-javadoc-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-jdk11
-      - odl-maven-verify-jobs
+    branch: master
+    build-node: ubuntu2004-docker-2c-2g
 
-    stream: magnesium
-    project: "infrautils"
-    project-name: "infrautils"
-    branch: "stable/magnesium"
-    java-version: "openjdk11"
     mvn-settings: "infrautils-settings"
-    mvn-opts: "-Xmx1024m"
+
     dependencies: "odlparent-merge-{stream}"
     email-upstream: "[infrautils] [odlparent]"
 
@@ -52,25 +26,26 @@
     staging-profile-id: 96fca0367756c
 
 - project:
-    name: infrautils-sodium
+    name: infrautils-6.0.x
     jobs:
-      - "{project-name}-distribution-check-{stream}"
-      - "{project-name}-maven-javadoc-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
-      - odl-maven-verify-jobs
+      - 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: sodium
-    project: "infrautils"
-    project-name: "infrautils"
-    branch: "stable/sodium"
     mvn-settings: "infrautils-settings"
-    mvn-opts: "-Xmx1024m"
+
     dependencies: "odlparent-merge-{stream}"
     email-upstream: "[infrautils] [odlparent]"
 
@@ -87,21 +62,27 @@
 
     build-node: centos7-builder-2c-1g
     mvn-settings: infrautils-settings
+    # Needs to be rather long until we sort out the performance of
+    # https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/
+    build-timeout: 60
 
 - 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
+          sonar-mvn-goal: >
+            jacoco:report -Djacoco.dataFile=$WORKSPACE/target/jacoco.exec
+            sonar:sonar
+
     project: "infrautils"
     project-name: "infrautils"
     branch: "master"
-    java-version: "openjdk11"
+    build-node: ubuntu2004-docker-2c-2g
+
     mvn-settings: "infrautils-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: infrautils-info