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

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

diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml
index 2b0e90d77a2fd9e3e4df33eb48bede8739ffab0c..dfaeb80fc10ae0b06a594e04dac2bd2b7cb47079 100644 (file)
--- a/jjb/aaa/aaa.yaml
+++ b/jjb/aaa/aaa.yaml
@@ -3,7 +3,7 @@
     name: aaa-master
     jobs:
       - "{project-name}-rtd-jobs":
-          build-node: centos7-builder-2c-2g
+          build-node: centos8-builder-2c-2g
           project-pattern: aaa
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-aaa/47615/
           rtd-token: 621132230e1307d38f4aaf27e669d7dfdf98532f
@@ -16,7 +16,6 @@
     branch: "master"
     java-version: "openjdk17"
     mvn-settings: "aaa-settings"
-    build-node: centos8-builder-4c-4g
     dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}"
     email-upstream: "[aaa] [odlparent] [yangtools] [controller]"
 
@@ -24,25 +23,22 @@
     staging-profile-id: 9318cf3c82c33
 
 - project:
-    name: aaa-0.15.x
+    name: aaa-0.17.x
     jobs:
       - "{project-name}-rtd-jobs":
-          build-node: centos7-builder-2c-2g
+          build-node: centos8-builder-2c-2g
           project-pattern: aaa
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-aaa/47615/
           rtd-token: 621132230e1307d38f4aaf27e669d7dfdf98532f
-      - 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: 0.15.x
+    stream: 0.17.x
     project: "aaa"
     project-name: "aaa"
-    branch: 0.15.x
-    java-version: "openjdk11"
+    branch: 0.17.x
+    java-version: "openjdk17"
     mvn-settings: "aaa-settings"
-    mvn-opts: "-Xmx1024m"
     dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}"
     email-upstream: "[aaa] [odlparent] [yangtools] [controller]"
 
@@ -50,46 +46,22 @@
     staging-profile-id: 9318cf3c82c33
 
 - project:
-    name: aaa-0.14.x
+    name: aaa-0.16.x
     jobs:
       - "{project-name}-rtd-jobs":
-          build-node: centos7-builder-2c-2g
+          build-node: centos8-builder-2c-2g
           project-pattern: aaa
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-aaa/47615/
           rtd-token: 621132230e1307d38f4aaf27e669d7dfdf98532f
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
-
-    stream: 0.14.x
-    project: "aaa"
-    project-name: "aaa"
-    branch: 0.14.x
-    java-version: "openjdk11"
-    mvn-settings: "aaa-settings"
-    mvn-opts: "-Xmx1024m"
-    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}"
-    email-upstream: "[aaa] [odlparent] [yangtools] [controller]"
-
-    # Used by the release job
-    staging-profile-id: 9318cf3c82c33
-- project:
-    name: aaa-0.13.x
-    jobs:
-      - "{project-name}-rtd-jobs":
-          build-node: centos7-builder-2c-2g
-          project-pattern: aaa
-          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-aaa/47615/
-          rtd-token: 621132230e1307d38f4aaf27e669d7dfdf98532f
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
+      - odl-maven-jobs-jdk17
+      - odl-maven-verify-jobs-jdk17
 
-    stream: 0.13.x
+    stream: 0.16.x
     project: "aaa"
     project-name: "aaa"
-    branch: 0.13.x
-    java-version: "openjdk11"
+    branch: 0.16.x
+    java-version: "openjdk17"
     mvn-settings: "aaa-settings"
-    mvn-opts: "-Xmx1024m"
     dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}"
     email-upstream: "[aaa] [odlparent] [yangtools] [controller]"
 
@@ -127,7 +99,6 @@
     java-version: "openjdk17"
     mvn-version: mvn38
     mvn-settings: "aaa-settings"
-    build-node: centos8-builder-4c-4g
     sonarcloud: true
     sonarcloud-project-organization: "{sonarcloud_project_organization}"
     sonarcloud-api-token: "{sonarcloud_api_token}"