X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fcontroller%2Fcontroller.yaml;h=50471c9faf8cbce346eb2162034f5fc77dad2fdc;hb=6db63fabeac500383eff09cf4f11dd3e3d0cb728;hp=7fca1f9a9520b78e9225114602c7ac02ee02b103;hpb=fbb6852790ef13e01d614200cf9c9ac821105ef5;p=releng%2Fbuilder.git

diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml
index 7fca1f9a9..50471c9fa 100644
--- a/jjb/controller/controller.yaml
+++ b/jjb/controller/controller.yaml
@@ -1,51 +1,26 @@
 ---
 - project:
-    name: controller-magnesium
+    name: controller-master
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-rtd-jobs':
+      - 'gerrit-release-merge':
           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
-
-    stream: magnesium
-    project: 'controller'
-    project-name: 'controller'
-    branch: 'master'
-    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]'
-
-    # Used by the release job
-    staging-profile-id: 96c1c9177efdd
-
-- project:
-    name: controller-sodium
-    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-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: sodium
+    stream: master
     project: 'controller'
     project-name: 'controller'
-    branch: 'stable/sodium'
+    branch: 'master'
+    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
+    mvn-version: mvn36
+    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]'
@@ -54,22 +29,22 @@
     staging-profile-id: 96c1c9177efdd
 
 - project:
-    name: controller-neon
+    name: controller-magnesium
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-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-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: neon
+    stream: magnesium
     project: 'controller'
     project-name: 'controller'
-    branch: 'stable/neon'
+    branch: 'stable/magnesium'
+    java-version: 'openjdk11'
     mvn-settings: 'controller-settings'
     mvn-goals: 'clean deploy -Pintegrationtests,docs'
     mvn-opts: '-Xmx4096m -Dmaven.compile.fork=true'
@@ -82,10 +57,9 @@
     staging-profile-id: 96c1c9177efdd
 
 - project:
-    name: controller-fluorine
+    name: controller-sodium
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
           project-pattern: controller
@@ -94,10 +68,10 @@
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: fluorine
+    stream: sodium
     project: 'controller'
     project-name: 'controller'
-    branch: 'stable/fluorine'
+    branch: 'stable/sodium'
     mvn-settings: 'controller-settings'
     mvn-goals: 'clean deploy -Pintegrationtests,docs'
     mvn-opts: '-Xmx4096m -Dmaven.compile.fork=true'
@@ -120,10 +94,14 @@
     project: 'controller'
     project-name: 'controller'
     branch: master
-    build-node: centos7-builder-8c-8g
+    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}'
 
 - project:
     name: controller-view