X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Faaa%2Faaa.yaml;h=56addf63b4b50b58582446f4d552a43c179dc47b;hb=f8b29d28615ccff1440901324955e53314a30ae4;hp=bbebed1cae220bcb17c3899b888de35ddd5e6f16;hpb=79c0ee538aea4c11720752b23f5416a344f30d2e;p=releng%2Fbuilder.git

diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml
index bbebed1ca..56addf63b 100644
--- a/jjb/aaa/aaa.yaml
+++ b/jjb/aaa/aaa.yaml
@@ -1,91 +1,90 @@
 ---
 - project:
-    name: aaa-sodium
+    name: aaa-master
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-rtd-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
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
+      - odl-maven-verify-jobs-jdk17
 
-    stream: sodium
-    project: 'aaa'
-    project-name: 'aaa'
-    branch: 'master'
-    mvn-settings: 'aaa-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[aaa] [odlparent] [yangtools] [controller]'
+    stream: master
+    project: "aaa"
+    project-name: "aaa"
+    branch: "master"
+    java-version: "openjdk11"
+    mvn-settings: "aaa-settings"
+    mvn-opts: "-Xmx1024m"
+    build-node: centos8-builder-4c-4g
+    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-neon
+    name: aaa-0.14.x
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-rtd-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
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
 
-    stream: neon
-    project: 'aaa'
-    project-name: 'aaa'
-    branch: 'stable/neon'
-    mvn-settings: 'aaa-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[aaa] [odlparent] [yangtools] [controller]'
+    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-fluorine
+    name: aaa-0.13.x
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-rtd-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
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
 
-    stream: fluorine
-    project: 'aaa'
-    project-name: 'aaa'
-    branch: 'stable/fluorine'
-    mvn-settings: 'aaa-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[aaa] [odlparent] [yangtools] [controller]'
+    stream: 0.13.x
+    project: "aaa"
+    project-name: "aaa"
+    branch: 0.13.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-oxygen
+    name: aaa-release-management
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
+      - gerrit-release-merge
 
-    disable-job: true
-    stream: oxygen
-    project: 'aaa'
-    project-name: 'aaa'
-    branch: 'stable/oxygen'
-    mvn-settings: 'aaa-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[aaa] [odlparent] [yangtools] [controller]'
+    project: aaa
+    project-name: aaa
 
-    # Used by the release job
-    staging-profile-id: 9318cf3c82c33
+    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
@@ -93,13 +92,30 @@
       - gerrit-maven-sonar:
           mvn-params: >
             -Dodl.jacoco.aggregateFile=$WORKSPACE/target/jacoco.exec
-            -Dsonar.jacoco.reportPath=$WORKSPACE/target/jacoco.exec
+            -Dskip.karaf.featureTest=true
+          sonar-mvn-goal: >
+            jacoco:report -Djacoco.dataFile=$WORKSPACE/target/jacoco.exec
+            sonar:sonar
 
-    project: 'aaa'
-    project-name: 'aaa'
-    branch: 'master'
-    mvn-settings: 'aaa-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    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
+    jobs:
+      - gerrit-info-yaml-verify
+    project: aaa
+    project-name: aaa
+    branch: "master"
+    build-node: centos7-builder-2c-1g
 
 - project:
     name: aaa-view