Remove odlparent-9.0.x jobs

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

diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml
index 599d0438561ec3bcf70a1a8531d964f8b46e3c6a..d34071762668c12d9e5565ce13f68f50711b84d9 100644 (file)
--- a/jjb/odlparent/odlparent.yaml
+++ b/jjb/odlparent/odlparent.yaml
@@ -8,8 +8,8 @@
           project-pattern: odlparent
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-odlparent/50830/
           rtd-token: e5afd4ac1ead64408d9e13cd1f628ade55512f8f
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
+      - odl-maven-jobs-jdk17
+      - odl-maven-verify-jobs-jdk17
       - gerrit-tox-verify
 
     project: odlparent
@@ -17,9 +17,8 @@
     stream: master
     branch: master
 
-    java-version: "openjdk11"
     mvn-settings: odlparent-settings
-    mvn-version: mvn36
+    build-node: centos8-builder-4c-4g
 
     dependencies: ""
     email-upstream: "[odlparent]"
@@ -35,7 +34,7 @@
     staging-profile-id: 880d5ac25eaa
 
 - project:
-    name: odlparent-6.0.x
+    name: odlparent-11.0.x
     jobs:
       - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
@@ -43,19 +42,17 @@
           project-pattern: odlparent
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-odlparent/50830/
           rtd-token: e5afd4ac1ead64408d9e13cd1f628ade55512f8f
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
+      - odl-maven-jobs-jdk17
+      - odl-maven-verify-jobs-jdk17
       - gerrit-tox-verify
 
     project: odlparent
     project-name: odlparent
-    stream: 6.0.x
-    branch: 6.0.x
+    stream: 11.0.x
+    branch: 11.0.x
 
-    java-version: "openjdk11"
     mvn-settings: odlparent-settings
-    mvn-opts: "-Xmx1024m"
-    mvn-version: mvn35
+    build-node: centos8-builder-4c-4g
 
     dependencies: ""
     email-upstream: "[odlparent]"
@@ -71,22 +68,26 @@
     staging-profile-id: 880d5ac25eaa
 
 - project:
-    name: odlparent-5.0.x
+    name: odlparent-10.0.x
     jobs:
-      - "{project-name}-maven-javadoc-jobs"
-      - odl-maven-jobs
+      - "{project-name}-rtd-jobs":
+          build-node: centos7-builder-2c-2g
+          doc-dir: .tox/docs/tmp/html
+          project-pattern: odlparent
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-odlparent/50830/
+          rtd-token: e5afd4ac1ead64408d9e13cd1f628ade55512f8f
+      - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
+      - odl-maven-verify-jobs-jdk17:
+          build-node: centos8-builder-4c-4g
       - gerrit-tox-verify
 
     project: odlparent
     project-name: odlparent
-    stream: 5.0.x
-    branch: 5.0.x
+    stream: 10.0.x
+    branch: 10.0.x
 
     mvn-settings: odlparent-settings
-    mvn-opts: "-Xmx1024m"
-    mvn-version: mvn35
-
     dependencies: ""
     email-upstream: "[odlparent]"
     archive-artifacts: >
@@ -117,12 +118,18 @@
       - gerrit-maven-sonar:
           mvn-params: >
             -Dodl.jacoco.aggregateFile=$WORKSPACE/target/jacoco.exec
-            -Dsonar.jacoco.reportPath=$WORKSPACE/target/jacoco.exec
+            -Dskip.karaf.featureTest=true
+          sonar-mvn-goal: >
+            jacoco:report -Djacoco.dataFile=$WORKSPACE/target/jacoco.exec
+            sonar:sonar
 
     project: "odlparent"
     project-name: "odlparent"
     branch: "master"
-    java-version: "openjdk11"
+
+    build-node: centos8-builder-4c-4g
+    java-version: "openjdk17"
+    mvn-version: mvn38
     mvn-settings: "odlparent-settings"
     mvn-opts: "-Xmx1024m"
     sonarcloud: true