X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fcontroller%2Fcontroller.yaml;h=169fa7f0e5eebdd20b88fe34717526629b3c24e1;hb=232a18be06afa78543dd8e833559e8088fe0baed;hp=b03b92c9d2181d4894e0d39db1cc1d33b6604ab1;hpb=dea65f1fae77649063d7d21645ae7e56e05e112e;p=releng%2Fbuilder.git

diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml
index b03b92c9d..169fa7f0e 100644
--- a/jjb/controller/controller.yaml
+++ b/jjb/controller/controller.yaml
@@ -2,9 +2,7 @@
 - project:
     name: controller-master
     jobs:
-      - 'gerrit-release-merge':
-          build-node: centos7-builder-2c-2g
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
           project-pattern: controller
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-controller/48288/
@@ -13,17 +11,17 @@
       - odl-maven-verify-jobs
 
     stream: master
-    project: 'controller'
-    project-name: 'controller'
-    branch: 'master'
-    java-version: 'openjdk11'
-    mvn-settings: 'controller-settings'
+    project: "controller"
+    project-name: "controller"
+    branch: "master"
+    java-version: "openjdk11"
+    mvn-settings: "controller-settings"
     mvn-version: mvn36
-    mvn-goals: 'clean deploy -Pdocs'
-    mvn-opts: '-Xmx3072m -Dmaven.compile.fork=true'
+    mvn-goals: "clean deploy -Pdocs"
+    mvn-opts: "-Xmx3072m -Dmaven.compile.fork=true"
     build-timeout: 90
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}'
-    email-upstream: '[controller] [odlparent] [yangtools] [aaa]'
+    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}"
+    email-upstream: "[controller] [odlparent] [yangtools] [aaa]"
 
     # Used by the release job
     staging-profile-id: 96c1c9177efdd
@@ -31,8 +29,8 @@
 - project:
     name: controller-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: controller
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-controller/48288/
@@ -41,47 +39,31 @@
       - odl-maven-verify-jobs
 
     stream: magnesium
-    project: 'controller'
-    project-name: 'controller'
-    branch: 'stable/magnesium'
-    java-version: 'openjdk11'
-    mvn-settings: 'controller-settings'
-    mvn-goals: 'clean deploy -Pintegrationtests,docs'
-    mvn-opts: '-Xmx4096m -Dmaven.compile.fork=true'
+    project: "controller"
+    project-name: "controller"
+    branch: "stable/magnesium"
+    java-version: "openjdk11"
+    mvn-settings: "controller-settings"
+    mvn-goals: "clean deploy -Pintegrationtests,docs"
+    mvn-opts: "-Xmx4096m -Dmaven.compile.fork=true"
     build-node: centos7-builder-8c-8g
     build-timeout: 90
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}'
-    email-upstream: '[controller] [odlparent] [yangtools] [aaa]'
+    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}"
+    email-upstream: "[controller] [odlparent] [yangtools] [aaa]"
 
     # Used by the release job
     staging-profile-id: 96c1c9177efdd
 
 - project:
-    name: controller-sodium
+    name: controller-release-management
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-rtd-jobs':
-          build-node: centos7-builder-2c-2g
-          project-pattern: controller
-          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-controller/48288/
-          rtd-token: b8440116c823a80c0fb0479eb7448a9196e6932f
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
+      - gerrit-release-merge
 
-    stream: sodium
-    project: 'controller'
-    project-name: 'controller'
-    branch: 'stable/sodium'
-    mvn-settings: 'controller-settings'
-    mvn-goals: 'clean deploy -Pintegrationtests,docs'
-    mvn-opts: '-Xmx4096m -Dmaven.compile.fork=true'
-    build-node: centos7-builder-8c-8g
-    build-timeout: 90
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}'
-    email-upstream: '[controller] [odlparent] [yangtools] [aaa]'
+    project: controller
+    project-name: controller
 
-    # Used by the release job
-    staging-profile-id: 96c1c9177efdd
+    build-node: centos7-builder-2c-1g
+    mvn-settings: controller-settings
 
 - project:
     name: controller-sonar
@@ -89,19 +71,22 @@
       - 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: 'controller'
-    project-name: 'controller'
+    project: "controller"
+    project-name: "controller"
     branch: master
-    java-version: 'openjdk11'
-    mvn-settings: 'controller-settings'
-    mvn-goals: 'clean deploy -Pintegrationtests,docs'
-    mvn-opts: '-Xmx4096m -Dmaven.compile.fork=true'
+    java-version: "openjdk11"
+    mvn-settings: "controller-settings"
+    mvn-goals: "clean deploy -Pintegrationtests,docs"
+    mvn-opts: "-Xmx4096m -Dmaven.compile.fork=true"
     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: controller-info