X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fopenflowplugin%2Fopenflowplugin.yaml;h=26a9d73d8e041b438144cec00f2dbf67669514d9;hb=0f91b32d1d08a4698f6b4106edff96ecffbfbefa;hp=588a41b5aa49039f2c0e2c03bc933ba705a99830;hpb=cb442a2449ec6e1f3fe74ffa1e2b359dee97cd5e;p=releng%2Fbuilder.git

diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml
index 588a41b5a..26a9d73d8 100644
--- a/jjb/openflowplugin/openflowplugin.yaml
+++ b/jjb/openflowplugin/openflowplugin.yaml
@@ -4,22 +4,18 @@
     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: 'openflowplugin'
     project-name: 'openflowplugin'
     branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'openflowplugin-settings'
-    mvn-goals: 'clean install javadoc:aggregate'
+    mvn-goals: 'clean deploy javadoc:aggregate'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    build-timeout: 90
     dependencies: >
         odlparent-merge-{stream},
         yangtools-merge-{stream},
@@ -36,21 +32,16 @@
     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: nitrogen
     project: 'openflowplugin'
     project-name: 'openflowplugin'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'openflowplugin-settings'
-    mvn-goals: 'clean install javadoc:aggregate'
+    mvn-goals: 'clean deploy javadoc:aggregate'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: >
         odlparent-merge-{stream},
@@ -68,22 +59,17 @@
     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: carbon
     project: 'openflowplugin'
     project-name: 'openflowplugin'
     branch: 'stable/carbon'
-    karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    build-node: centos7-builder-2c-8g
+    karaf-version: 'karaf3'
     mvn-settings: 'openflowplugin-settings'
-    mvn-goals: 'clean install javadoc:aggregate'
+    mvn-goals: 'clean deploy javadoc:aggregate'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: >
         odlparent-merge-{stream},
@@ -99,10 +85,11 @@
 - project:
     name: openflowplugin-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'openflowplugin'
     project-name: 'openflowplugin'
     branch: 'master'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'openflowplugin-settings'
-    mvn-goals: 'clean install javadoc:aggregate'
+    mvn-goals: 'clean deploy javadoc:aggregate'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'