X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fcontroller%2Fcontroller.yaml;h=9d254e29e587b2cb47657b2ea25369d917c7951f;hb=d69ec488fcfb41f6e977bac4bd3a045e480add66;hp=8efe2f4ebde9b5a7c582224a0f926ce5315d5344;hpb=6aad4a9bd5ef29209ec9760ec736724a8b88bdda;p=releng%2Fbuilder.git

diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml
index 8efe2f4eb..9d254e29e 100644
--- a/jjb/controller/controller.yaml
+++ b/jjb/controller/controller.yaml
@@ -1,8 +1,9 @@
 ---
 - project:
-    name: controller-magnesium
+    name: controller-master
     jobs:
-      - '{project-name}-distribution-check-{stream}':
+      - 'gerrit-release-merge':
+          build-node: centos7-builder-2c-2g
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
           project-pattern: controller
@@ -11,15 +12,15 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: magnesium
+    stream: master
     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'
-    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]'
@@ -28,25 +29,25 @@
     staging-profile-id: 96c1c9177efdd
 
 - project:
-    name: controller-sodium
+    name: controller-magnesium
     jobs:
-      - '{project-name}-distribution-check-{stream}'
+      - '{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: magnesium
     project: 'controller'
     project-name: 'controller'
-    branch: 'stable/sodium'
+    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
+    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]'
@@ -55,10 +56,9 @@
     staging-profile-id: 96c1c9177efdd
 
 - project:
-    name: controller-neon
+    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
@@ -67,10 +67,10 @@
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: neon
+    stream: sodium
     project: 'controller'
     project-name: 'controller'
-    branch: 'stable/neon'
+    branch: 'stable/sodium'
     mvn-settings: 'controller-settings'
     mvn-goals: 'clean deploy -Pintegrationtests,docs'
     mvn-opts: '-Xmx4096m -Dmaven.compile.fork=true'
@@ -93,24 +93,6 @@
     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'
-
-- project:
-    name: controller-sonarcloud
-    jobs:
-      - gerrit-maven-sonar:
-          mvn-params: >
-            -Dodl.jacoco.aggregateFile=$WORKSPACE/target/jacoco.exec
-            -Dsonar.jacoco.reportPath=$WORKSPACE/target/jacoco.exec
-
-    project: 'controller'
-    project-name: 'controller-sonarcloud'
-    branch: master
-    build-node: centos7-builder-8c-8g
     java-version: 'openjdk11'
     mvn-settings: 'controller-settings'
     mvn-goals: 'clean deploy -Pintegrationtests,docs'