Merge "Remove odlmicro CSIT from AR test"

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

diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml
index be2616d049ffb0491c530acfd222e3ad669ab9af..e632895d3071b7e5e1ba786bcbe0733a8909534b 100644 (file)
--- a/jjb/aaa/aaa.yaml
+++ b/jjb/aaa/aaa.yaml
@@ -1,9 +1,9 @@
 ---
 - project:
-    name: aaa-aluminium
+    name: aaa-silicon
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-distribution-check-{stream}"
+      - "{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/
@@ -11,24 +11,24 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: aluminium
-    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]'
+    stream: silicon
+    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]"
 
     # Used by the release job
     staging-profile-id: 9318cf3c82c33
 
 - project:
-    name: aaa-magnesium
+    name: aaa-aluminium
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-distribution-check-{stream}"
+      - "{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/
@@ -36,39 +36,40 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: magnesium
-    project: 'aaa'
-    project-name: 'aaa'
-    branch: 'stable/magnesium'
-    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]'
+    stream: aluminium
+    project: "aaa"
+    project-name: "aaa"
+    branch: "stable/aluminium"
+    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-sodium
+    name: aaa-magnesium
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-distribution-check-{stream}"
+      - "{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: sodium
-    project: 'aaa'
-    project-name: 'aaa'
-    branch: 'stable/sodium'
-    mvn-settings: 'aaa-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[aaa] [odlparent] [yangtools] [controller]'
+    stream: magnesium
+    project: "aaa"
+    project-name: "aaa"
+    branch: "stable/magnesium"
+    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
@@ -79,18 +80,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'
-    java-version: 'openjdk11'
-    mvn-settings: 'aaa-settings'
-    mvn-opts: '-Xmx1024m'
+    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}'
+    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