X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fcontroller%2Fcontroller.yaml;h=8683803c404711ea897d2b00bc4261481ed585e5;hb=f5611e3768895d4b4ca20c7719a2bd9fe5652fca;hp=54c3a214f7d97a8e333dbf69ad9c3767f4a8bfc1;hpb=aa09d0d9c1737f2fcb3dc20c4b60f607f806a500;p=releng%2Fbuilder.git

diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml
index 54c3a214f..8683803c4 100644
--- a/jjb/controller/controller.yaml
+++ b/jjb/controller/controller.yaml
@@ -3,27 +3,20 @@
     name: controller-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'controller'
     project-name: 'controller'
     branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'controller-settings'
-    mvn-goals: 'clean install -Pintegrationtests,docs'
+    mvn-goals: 'clean deploy -Pintegrationtests,docs'
     mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -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]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96c1c9177efdd
@@ -32,25 +25,19 @@
     name: controller-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'controller'
     project-name: 'controller'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'controller-settings'
-    mvn-goals: 'clean install -Pintegrationtests,docs'
+    mvn-goals: 'clean deploy -Pintegrationtests,docs'
     mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -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]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96c1c9177efdd
@@ -59,26 +46,20 @@
     name: controller-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'controller'
     project-name: 'controller'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'controller-settings'
-    mvn-goals: 'clean install -Pintegrationtests,docs'
+    mvn-goals: 'clean deploy -Pintegrationtests,docs'
     mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -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]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96c1c9177efdd
@@ -91,6 +72,7 @@
     project: 'controller'
     project-name: 'controller'
     branch: master
+    build-node: centos7-builder-8c-8g
     mvn-settings: 'controller-settings'
-    mvn-goals: 'clean install -Pintegrationtests,docs'
+    mvn-goals: 'clean deploy -Pintegrationtests,docs'
     mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'