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

diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml
index fd72ee3e7..50471c9fa 100644
--- a/jjb/controller/controller.yaml
+++ b/jjb/controller/controller.yaml
@@ -2,12 +2,13 @@
 - project:
     name: controller-master
     jobs:
+      - 'gerrit-release-merge':
+          build-node: centos7-builder-2c-2g
       - '{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
-      - 'gerrit-release-merge'
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
@@ -19,8 +20,7 @@
     mvn-settings: 'controller-settings'
     mvn-version: mvn36
     mvn-goals: 'clean deploy -Pdocs'
-    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]'
@@ -94,24 +94,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'