X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fcontroller%2Fcontroller.yaml;h=b03b92c9d2181d4894e0d39db1cc1d33b6604ab1;hb=119296e54618a3d9a18d9f735503680ff928a18c;hp=91be5fedba93a733def35bfe23b421ba785bbdd6;hpb=c41d5eea359f449bf2b90682358d856e8784103f;p=releng%2Fbuilder.git

diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml
index 91be5fedb..b03b92c9d 100644
--- a/jjb/controller/controller.yaml
+++ b/jjb/controller/controller.yaml
@@ -2,6 +2,8 @@
 - 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
@@ -17,9 +19,8 @@
     java-version: 'openjdk11'
     mvn-settings: 'controller-settings'
     mvn-version: mvn36
-    mvn-goals: 'clean deploy -Pintegrationtests,docs'
-    mvn-opts: '-Xmx4096m -Dmaven.compile.fork=true'
-    build-node: centos7-builder-8c-8g
+    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]'
@@ -93,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'
@@ -120,6 +103,15 @@
     sonarcloud-api-token: '{sonarcloud_api_token}'
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
 
+- project:
+    name: controller-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: controller
+    project-name: controller
+    branch: master
+    build-node: centos7-builder-2c-1g
+
 - project:
     name: controller-view
     views: