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

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

diff --git a/jjb/infrautils/infrautils.yaml b/jjb/infrautils/infrautils.yaml
index d9210e2642c4c24b909f6fe7850fcbe478080b3c..41f213a7278cd477ed5268287f77a95d82dcb49c 100644 (file)
--- a/jjb/infrautils/infrautils.yaml
+++ b/jjb/infrautils/infrautils.yaml
@@ -3,7 +3,7 @@
     name: infrautils-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: infrautils
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-infrautils/38993/
@@ -14,10 +14,9 @@
     stream: master
     project: "infrautils"
     project-name: "infrautils"
-    branch: "master"
+    branch: master
     java-version: "openjdk17"
     mvn-settings: "infrautils-settings"
-    build-node: centos8-builder-4c-4g
     dependencies: "odlparent-merge-{stream}"
     email-upstream: "[infrautils] [odlparent]"
 
@@ -25,10 +24,10 @@
     staging-profile-id: 96fca0367756c
 
 - project:
-    name: infrautils-4.0.x
+    name: infrautils-5.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: infrautils
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-infrautils/38993/
@@ -36,13 +35,12 @@
       - odl-maven-jobs-jdk17
       - odl-maven-verify-jobs-jdk17
 
-    stream: 4.0.x
+    stream: 5.0.x
     project: "infrautils"
     project-name: "infrautils"
-    branch: "4.0.x"
+    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 +48,22 @@
     staging-profile-id: 96fca0367756c
 
 - project:
-    name: infrautils-3.0.x
+    name: infrautils-4.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: 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-verify-jobs-jdk17:
-          build-node: centos8-builder-4c-4g
+      - odl-maven-jobs-jdk17
+      - odl-maven-verify-jobs-jdk17
 
-    stream: 3.0.x
+    stream: 4.0.x
     project: "infrautils"
     project-name: "infrautils"
-    branch: 3.0.x
-    java-version: "openjdk11"
+    branch: "4.0.x"
+    java-version: "openjdk17"
     mvn-settings: "infrautils-settings"
     dependencies: "odlparent-merge-{stream}"
     email-upstream: "[infrautils] [odlparent]"
@@ -106,7 +102,6 @@
     java-version: "openjdk17"
     mvn-version: mvn38
     mvn-settings: "infrautils-settings"
-    build-node: centos8-builder-4c-4g
     sonarcloud: true
     sonarcloud-project-organization: "{sonarcloud_project_organization}"
     sonarcloud-api-token: "{sonarcloud_api_token}"