Update odlparent jobs

odlparent has a stability branch for Calcium, this juggles the jobs to support it using centos8/Java 18/maven-3.8. The second change is to use exclusively ubuntu-20.04/Java 21/maven-3.9 jobs for master, in preparation for 2024.09 Scandium. We also drop their size down to 2c/2g. Change-Id: Ie539f897479973c53f2bf8e84250a901fa9499c1 Signed-off-by: Robert Varga <[email protected]>
opendaylight · May 28, 2024 · 1b17067 · 1b17067
1 parent ce3762c
commit 1b17067
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml
@@ -3,19 +3,20 @@
     name: odlparent-master
     jobs:
       - "{project-name}-rtd-jobs":
-          build-node: centos8-builder-2c-2g
+          build-node: ubuntu2004-docker-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-jdk17
-      - odl-maven-verify-jobs-jdk17
+      - odl-maven-jobs-jdk21
+      - odl-maven-verify-jobs-jdk21
       - gerrit-tox-verify
 
     project: odlparent
     project-name: odlparent
     stream: master
     branch: master
+    build-node: ubuntu2004-docker-2c-2g
 
     mvn-settings: odlparent-settings
 
@@ -33,23 +34,22 @@
     staging-profile-id: 880d5ac25eaa
 
 - project:
-    name: odlparent-master-jdk21
+    name: odlparent-13.1.x
     jobs:
       - "{project-name}-rtd-jobs":
-          build-node: ubuntu2004-docker-4c-4g
+          build-node: centos8-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-jdk21
-      - odl-maven-verify-jobs-jdk21
+      - odl-maven-jobs-jdk17
+      - odl-maven-verify-jobs-jdk17
       - gerrit-tox-verify
 
     project: odlparent
-    project-name: odlparent-jdk21
-    stream: master
-    branch: master
-    build-node: ubuntu2004-docker-4c-4g
+    project-name: odlparent
+    stream: 13.1.x
+    branch: 13.1.x
 
     mvn-settings: odlparent-settings