Feat: switch default build-node to centos8-4c-4g

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

diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml
index 0cf1f23918490ab02b907cd9884ca4496e824a1a..e4ea294dca9acaea606bca119f4aefe361b256dd 100644 (file)
--- a/jjb/odlparent/odlparent.yaml
+++ b/jjb/odlparent/odlparent.yaml
@@ -3,7 +3,7 @@
     name: odlparent-master
     jobs:
       - "{project-name}-rtd-jobs":
-          build-node: centos7-builder-2c-2g
+          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/
@@ -18,7 +18,6 @@
     branch: master
 
     mvn-settings: odlparent-settings
-    build-node: centos8-builder-4c-4g
 
     dependencies: ""
     email-upstream: "[odlparent]"
@@ -34,26 +33,25 @@
     staging-profile-id: 880d5ac25eaa
 
 - project:
-    name: odlparent-10.0.x
+    name: odlparent-12.0.x
     jobs:
       - "{project-name}-rtd-jobs":
-          build-node: centos7-builder-2c-2g
+          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-jdk11
-      - odl-maven-verify-jobs
-      - odl-maven-verify-jobs-jdk17:
-        build-node: centos8-builder-4c-4g
+      - odl-maven-jobs-jdk17
+      - odl-maven-verify-jobs-jdk17
       - gerrit-tox-verify
 
+    stream: 12.0.x
     project: odlparent
     project-name: odlparent
-    stream: 10.0.x
-    branch: 10.0.x
+    branch: 12.0.x
 
     mvn-settings: odlparent-settings
+
     dependencies: ""
     email-upstream: "[odlparent]"
     archive-artifacts: >
@@ -68,26 +66,24 @@
     staging-profile-id: 880d5ac25eaa
 
 - project:
-    name: odlparent-9.0.x
+    name: odlparent-11.0.x
     jobs:
       - "{project-name}-rtd-jobs":
-          build-node: centos7-builder-2c-2g
+          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-jdk11
-      - odl-maven-verify-jobs
+      - odl-maven-jobs-jdk17
+      - odl-maven-verify-jobs-jdk17
       - gerrit-tox-verify
 
     project: odlparent
     project-name: odlparent
-    stream: 9.0.x
-    branch: 9.0.x
+    stream: 11.0.x
+    branch: 11.0.x
 
-    java-version: "openjdk11"
     mvn-settings: odlparent-settings
-    mvn-version: mvn36
 
     dependencies: ""
     email-upstream: "[odlparent]"
@@ -128,7 +124,6 @@
     project-name: "odlparent"
     branch: "master"
 
-    build-node: centos8-builder-4c-4g
     java-version: "openjdk17"
     mvn-version: mvn38
     mvn-settings: "odlparent-settings"