X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fopenflowplugin%2Fopenflowplugin.yaml;h=f3236868905dfeb732795cacbaad999e650b4d7c;hb=39a0450315a14058a0c8fd7eb8c53fad2637249f;hp=0d720a5e675934ba8a639bbf75db5e8d4be01dff;hpb=153de306fdad26241aacb26ff06cadd0d77654b3;p=releng%2Fbuilder.git

diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml
index 0d720a5e6..f32368689 100644
--- a/jjb/openflowplugin/openflowplugin.yaml
+++ b/jjb/openflowplugin/openflowplugin.yaml
@@ -2,26 +2,19 @@
 - project:
     name: openflowplugin-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
       - '{project-name}-maven-javadoc-jobs'
-      - gerrit-maven-verify-dependencies
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'openflowplugin'
     project-name: 'openflowplugin'
     branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     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},
@@ -30,26 +23,23 @@
     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
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'openflowplugin'
     project-name: 'openflowplugin'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     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},
@@ -59,27 +49,24 @@
     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
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'openflowplugin'
     project-name: 'openflowplugin'
     branch: 'stable/carbon'
-    karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    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},
@@ -89,13 +76,16 @@
     email-upstream: '[openflowplugin] [odlparent] [yangtools] [controller] [openflowjava]'
     archive-artifacts: 'model/*/target/site/**'
 
+    # Used by the release job
+    staging-profile-id: a68a76dc1b44c
+
 - project:
     name: openflowplugin-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'openflowplugin'
     project-name: 'openflowplugin'
     branch: 'master'
     mvn-settings: 'openflowplugin-settings'
-    mvn-goals: 'clean install javadoc:aggregate'
+    mvn-goals: 'clean deploy javadoc:aggregate'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'