X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Focpplugin%2Focpplugin.yaml;h=3119c12f8fb20ad6fcf1a8e65acf85fcd8b2e5d9;hb=179eb6fdb7167a2c4a5d36226a72f1ed2adcd5bc;hp=728f00bd119f6a14a893fc27d3175ba8ff32a07a;hpb=08c409cd288c13f6796d88e537c76a2b529a764b;p=releng%2Fbuilder.git

diff --git a/jjb/ocpplugin/ocpplugin.yaml b/jjb/ocpplugin/ocpplugin.yaml
index 728f00bd1..3119c12f8 100644
--- a/jjb/ocpplugin/ocpplugin.yaml
+++ b/jjb/ocpplugin/ocpplugin.yaml
@@ -1,19 +1,16 @@
 ---
 - project:
-    name: ocpplugin-nitrogen
+    name: ocpplugin-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: nitrogen
+    stream: oxygen
     project: 'ocpplugin'
     project-name: 'ocpplugin'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -26,21 +23,21 @@
     email-upstream: '[ocpplugin] [odlparent] [yangtools] [controller]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a687673279f9c
+
 - project:
-    name: ocpplugin-carbon
+    name: ocpplugin-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: carbon
+    stream: nitrogen
     project: 'ocpplugin'
     project-name: 'ocpplugin'
-    branch: 'stable/carbon'
-    jdk: openjdk8
+    branch: 'stable/nitrogen'
     jdks:
       - openjdk8
     maven:
@@ -53,21 +50,22 @@
     email-upstream: '[ocpplugin] [odlparent] [yangtools] [controller]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a687673279f9c
+
 - project:
-    name: ocpplugin-boron
+    name: ocpplugin-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: boron
+    stream: carbon
     project: 'ocpplugin'
     project-name: 'ocpplugin'
-    branch: 'stable/boron'
-    jdk: openjdk8
+    branch: 'stable/carbon'
+    karaf-version: karaf3
     jdks:
       - openjdk8
     maven:
@@ -80,6 +78,9 @@
     email-upstream: '[ocpplugin] [odlparent] [yangtools] [controller]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a687673279f9c
+
 - project:
     name: ocpplugin-sonar
     jobs: