X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Focpplugin%2Focpplugin.yaml;h=eb99c400c7a4c0944a5943839a3d6be869bd13b7;hb=f5611e3768895d4b4ca20c7719a2bd9fe5652fca;hp=4f8e7e28a54988740852cc03c6b97c1b61b9adbf;hpb=a18261a3fc9b605f796b648511c859df86742f51;p=releng%2Fbuilder.git

diff --git a/jjb/ocpplugin/ocpplugin.yaml b/jjb/ocpplugin/ocpplugin.yaml
index 4f8e7e28a..eb99c400c 100644
--- a/jjb/ocpplugin/ocpplugin.yaml
+++ b/jjb/ocpplugin/ocpplugin.yaml
@@ -1,93 +1,65 @@
 ---
 - project:
-    name: ocpplugin-nitrogen
+    name: ocpplugin-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}'
+      - odl-maven-jobs
 
-    stream: nitrogen
+    stream: oxygen
     project: 'ocpplugin'
     project-name: 'ocpplugin'
     branch: 'master'
-    jdk: openjdk8
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'ocpplugin-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     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}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - odl-maven-jobs
 
-    stream: carbon
+    stream: nitrogen
     project: 'ocpplugin'
     project-name: 'ocpplugin'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    jdk: openjdk8
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/nitrogen'
     mvn-settings: 'ocpplugin-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     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}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - odl-maven-jobs
 
-    stream: boron
+    stream: carbon
     project: 'ocpplugin'
     project-name: 'ocpplugin'
-    branch: 'stable/boron'
+    branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'ocpplugin-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[ocpplugin] [odlparent] [yangtools] [controller]'
-    archive-artifacts: ''
+
+    # Used by the release job
+    staging-profile-id: a687673279f9c
 
 - project:
     name: ocpplugin-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'ocpplugin'
     project-name: 'ocpplugin'
     branch: 'master'
     mvn-settings: 'ocpplugin-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'