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 e632895d3071b7e5e1ba786bcbe0733a8909534b..545d5cee528dc9e1315611c5f1fe36bdcc14e261 100644 (file)
--- a/jjb/aaa/aaa.yaml
+++ b/jjb/aaa/aaa.yaml
@@ -1,23 +1,20 @@
 ---
 - project:
-    name: aaa-silicon
+    name: aaa-master
     jobs:
-      - "{project-name}-distribution-check-{stream}"
       - "{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-jobs-jdk17
+      - odl-maven-verify-jobs-jdk17
 
-    stream: silicon
+    stream: master
     project: "aaa"
     project-name: "aaa"
     branch: "master"
-    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]"
 
@@ -25,24 +22,21 @@
     staging-profile-id: 9318cf3c82c33
 
 - project:
-    name: aaa-aluminium
+    name: aaa-0.18.x
     jobs:
-      - "{project-name}-distribution-check-{stream}"
       - "{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-jobs-jdk17
+      - odl-maven-verify-jobs-jdk17
 
-    stream: aluminium
+    stream: 0.18.x
     project: "aaa"
     project-name: "aaa"
-    branch: "stable/aluminium"
-    java-version: "openjdk11"
+    branch: 0.18.x
     mvn-settings: "aaa-settings"
-    mvn-opts: "-Xmx1024m"
     dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}"
     email-upstream: "[aaa] [odlparent] [yangtools] [controller]"
 
@@ -50,34 +44,45 @@
     staging-profile-id: 9318cf3c82c33
 
 - project:
-    name: aaa-magnesium
+    name: aaa-0.17.x
     jobs:
-      - "{project-name}-distribution-check-{stream}"
       - "{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-jobs-jdk17
+      - odl-maven-verify-jobs-jdk17
 
-    stream: magnesium
+    stream: 0.17.x
     project: "aaa"
     project-name: "aaa"
-    branch: "stable/magnesium"
-    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]"
 
     # Used by the release job
     staging-profile-id: 9318cf3c82c33
 
+- project:
+    name: aaa-release-management
+    jobs:
+      - gerrit-release-merge
+
+    project: aaa
+    project-name: aaa
+
+    build-node: centos7-builder-2c-1g
+    mvn-settings: aaa-settings
+    # Needs to be rather long until we sort out the performance of
+    # https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/
+    build-timeout: 60
+
 - 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
@@ -88,13 +93,7 @@
     project: "aaa"
     project-name: "aaa"
     branch: "master"
-    java-version: "openjdk11"
     mvn-settings: "aaa-settings"
-    mvn-opts: "-Xmx1024m"
-    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