Merge "CI: Use Ubuntu 2004 builder for docs jobs"

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

diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml
index 00e2b69f44824031042f528bfc242b544255cd20..545d5cee528dc9e1315611c5f1fe36bdcc14e261 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
@@ -14,9 +14,7 @@
     project: "aaa"
     project-name: "aaa"
     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,23 +22,21 @@
     staging-profile-id: 9318cf3c82c33
 
 - project:
-    name: aaa-0.16.x
+    name: aaa-0.18.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-jdk17
       - odl-maven-verify-jobs-jdk17
 
-    stream: 0.16.x
+    stream: 0.18.x
     project: "aaa"
     project-name: "aaa"
-    branch: 0.16.x
-    java-version: "openjdk17"
+    branch: 0.18.x
     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]"
 
@@ -48,25 +44,21 @@
     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
     mvn-settings: "aaa-settings"
-    mvn-opts: "-Xmx1024m"
     dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}"
     email-upstream: "[aaa] [odlparent] [yangtools] [controller]"
 
@@ -90,7 +82,7 @@
 - project:
     name: aaa-sonar
     jobs:
-      - gerrit-maven-sonar:
+      - odl-sonar-jobs-jdk17:
           mvn-params: >
             -Dodl.jacoco.aggregateFile=$WORKSPACE/target/jacoco.exec
             -Dskip.karaf.featureTest=true
@@ -101,14 +93,7 @@
     project: "aaa"
     project-name: "aaa"
     branch: "master"
-    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}"
-    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
 
 - project:
     name: aaa-info