X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fopenflowplugin%2Fopenflowplugin.yaml;h=07582f1f8d72b63f2c0d12a8bd9949cc7e6e9fb2;hb=24ed5d0799c75d7d7d83c0003f41b6f87bdcec3d;hp=588a41b5aa49039f2c0e2c03bc933ba705a99830;hpb=c8e1f0ba336b660af6949da3fe8c2a2dbf00fee5;p=releng%2Fbuilder.git

diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml
index 588a41b5a..07582f1f8 100644
--- a/jjb/openflowplugin/openflowplugin.yaml
+++ b/jjb/openflowplugin/openflowplugin.yaml
@@ -1,24 +1,19 @@
 ---
 - project:
-    name: openflowplugin-oxygen
+    name: openflowplugin-fluorine
     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
+    stream: fluorine
     project: 'openflowplugin'
     project-name: 'openflowplugin'
     branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    build-node: centos7-builder-2c-8g
+    build-timeout: 90
     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},
@@ -26,31 +21,25 @@
         controller-merge-{stream},
         openflowjava-merge-{stream}
     email-upstream: '[openflowplugin] [odlparent] [yangtools] [controller] [openflowjava]'
-    archive-artifacts: 'model/*/target/site/**'
 
     # Used by the release job
     staging-profile-id: a68a76dc1b44c
 
 - project:
-    name: openflowplugin-nitrogen
+    name: openflowplugin-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: nitrogen
+    stream: oxygen
     project: 'openflowplugin'
     project-name: 'openflowplugin'
-    branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
+    build-node: centos7-builder-2c-8g
+    build-timeout: 90
     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},
@@ -58,32 +47,25 @@
         controller-merge-{stream},
         openflowjava-merge-{stream}
     email-upstream: '[openflowplugin] [odlparent] [yangtools] [controller] [openflowjava]'
-    archive-artifacts: 'model/*/target/site/**'
 
     # Used by the release job
     staging-profile-id: a68a76dc1b44c
 
 - project:
-    name: openflowplugin-carbon
+    name: openflowplugin-nitrogen
     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
+    stream: nitrogen
     project: 'openflowplugin'
     project-name: 'openflowplugin'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/nitrogen'
+    build-node: centos7-builder-2c-8g
+    build-timeout: 90
     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},
@@ -91,7 +73,6 @@
         controller-merge-{stream},
         openflowjava-merge-{stream}
     email-upstream: '[openflowplugin] [odlparent] [yangtools] [controller] [openflowjava]'
-    archive-artifacts: 'model/*/target/site/**'
 
     # Used by the release job
     staging-profile-id: a68a76dc1b44c
@@ -99,10 +80,12 @@
 - project:
     name: openflowplugin-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'openflowplugin'
     project-name: 'openflowplugin'
     branch: 'master'
+    build-node: centos7-builder-2c-8g
+    build-timeout: 90
     mvn-settings: 'openflowplugin-settings'
-    mvn-goals: 'clean install javadoc:aggregate'
+    mvn-goals: 'clean deploy javadoc:aggregate'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'