Merge "Fix ovsdb sonar configuration"

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

diff --git a/jjb/coe/coe.yaml b/jjb/coe/coe.yaml
index 792f7af8f41f98f07e98645baaa5a54b4d0b5123..23104b16618939234c970826c0b0ddd961e258ee 100644 (file)
--- a/jjb/coe/coe.yaml
+++ b/jjb/coe/coe.yaml
@@ -1,8 +1,8 @@
 ---
 - project:
-    name: coe-aluminium
+    name: coe-silicon
     jobs:
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
           project-pattern: coe
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-coe/34924/
@@ -10,24 +10,24 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    project: 'coe'
-    project-name: 'coe'
-    stream: aluminium
-    branch: 'master'
-    java-version: 'openjdk11'
-    mvn-settings: 'coe-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[coe] [odlparent] [yangtools] [controller]'
+    project: "coe"
+    project-name: "coe"
+    stream: silicon
+    branch: "master"
+    java-version: "openjdk11"
+    mvn-settings: "coe-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}"
+    email-upstream: "[coe] [odlparent] [yangtools] [controller]"
     build-node: centos7-docker-2c-8g
 
     # Used by the release job
     staging-profile-id: 96c0be46aac33
 
 - project:
-    name: coe-magnesium
+    name: coe-aluminium
     jobs:
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
           project-pattern: coe
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-coe/34924/
@@ -35,40 +35,40 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    project: 'coe'
-    project-name: 'coe'
-    stream: magnesium
-    branch: 'stable/magnesium'
-    java-version: 'openjdk11'
-    mvn-settings: 'coe-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[coe] [odlparent] [yangtools] [controller]'
+    project: "coe"
+    project-name: "coe"
+    stream: aluminium
+    branch: "stable/aluminium"
+    java-version: "openjdk11"
+    mvn-settings: "coe-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}"
+    email-upstream: "[coe] [odlparent] [yangtools] [controller]"
     build-node: centos7-docker-2c-8g
 
     # Used by the release job
     staging-profile-id: 96c0be46aac33
 
 - project:
-    name: coe-sodium
+    name: coe-magnesium
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
           project-pattern: coe
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-coe/34924/
           rtd-token: 95a5a8fed43b75c6be8432a2643f20a344ba5155
-      - odl-maven-jobs
+      - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    project: 'coe'
-    project-name: 'coe'
-    stream: sodium
-    branch: 'stable/sodium'
-    mvn-settings: 'coe-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[coe] [odlparent] [yangtools] [controller]'
+    project: "coe"
+    project-name: "coe"
+    stream: magnesium
+    branch: "stable/magnesium"
+    java-version: "openjdk11"
+    mvn-settings: "coe-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}"
+    email-upstream: "[coe] [odlparent] [yangtools] [controller]"
     build-node: centos7-docker-2c-8g
 
     # Used by the release job
@@ -79,12 +79,16 @@
     jobs:
       - gerrit-maven-sonar
 
-    project: 'coe'
-    project-name: 'coe'
-    branch: 'master'
-    java-version: 'openjdk11'
-    mvn-settings: 'coe-settings'
-    mvn-opts: '-Xmx1024m'
+    project: "coe"
+    project-name: "coe"
+    branch: "master"
+    java-version: "openjdk11"
+    mvn-settings: "coe-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: coe-info