X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fopenflowplugin%2Fopenflowplugin.yaml;h=e2f8167e5dc1096944738340b7ed3752e3d39664;hb=d2728da8c27b3fa350c24308ff364f2a469596c7;hp=dabeeec7abfa7fbab65d852e8077f3de60cab585;hpb=2560c7522b16c32b6057426d3b794452e0cccd1a;p=releng%2Fbuilder.git

diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml
index dabeeec7a..e2f8167e5 100644
--- a/jjb/openflowplugin/openflowplugin.yaml
+++ b/jjb/openflowplugin/openflowplugin.yaml
@@ -1,18 +1,17 @@
 ---
 - project:
-    name: openflowplugin-nitrogen
+    name: openflowplugin-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
+      - '{project-name}-maven-javadoc-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: nitrogen
+    stream: oxygen
     project: 'openflowplugin'
     project-name: 'openflowplugin'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -29,21 +28,22 @@
     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}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
+      - '{project-name}-maven-javadoc-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: carbon
+    stream: nitrogen
     project: 'openflowplugin'
     project-name: 'openflowplugin'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    jdk: openjdk8
+    branch: 'stable/nitrogen'
     jdks:
       - openjdk8
     maven:
@@ -60,21 +60,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-boron
+    name: openflowplugin-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
+      - '{project-name}-maven-javadoc-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: boron
+    stream: carbon
     project: 'openflowplugin'
     project-name: 'openflowplugin'
-    branch: 'stable/boron'
+    branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -91,10 +93,13 @@
     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'