Merge "Move unimgr Sonar scan to Sonarcloud"

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

diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml
index 379aeb37e9790b65080f347f2841fbc46fb80e5f..e13c590b9617b829563ec84883f8c43bb71040ba 100644 (file)
--- a/jjb/aaa/aaa.yaml
+++ b/jjb/aaa/aaa.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: aaa-magnesium
+    name: aaa-aluminium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-rtd-jobs':
@@ -11,7 +11,7 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: magnesium
+    stream: aluminium
     project: 'aaa'
     project-name: 'aaa'
     branch: 'master'
@@ -25,7 +25,7 @@
     staging-profile-id: 9318cf3c82c33
 
 - project:
-    name: aaa-sodium
+    name: aaa-magnesium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-rtd-jobs':
@@ -33,13 +33,14 @@
           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: sodium
+    stream: magnesium
     project: 'aaa'
     project-name: 'aaa'
-    branch: 'stable/sodium'
+    branch: 'stable/magnesium'
+    java-version: 'openjdk11'
     mvn-settings: 'aaa-settings'
     mvn-opts: '-Xmx1024m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
@@ -49,7 +50,7 @@
     staging-profile-id: 9318cf3c82c33
 
 - project:
-    name: aaa-neon
+    name: aaa-sodium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-rtd-jobs':
@@ -60,10 +61,10 @@
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: neon
+    stream: sodium
     project: 'aaa'
     project-name: 'aaa'
-    branch: 'stable/neon'
+    branch: 'stable/sodium'
     mvn-settings: 'aaa-settings'
     mvn-opts: '-Xmx1024m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
@@ -86,6 +87,19 @@
     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