X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Focpplugin%2Focpplugin.yaml;h=496e31ec7e2b14fcb1fec297ca721dc83bbefe2f;hb=0e0e34daa29f5cd386428cc72571b1e3dee6abfa;hp=c7169ae3fd047de7bb388489a4af272e1ab78386;hpb=dac658c4a6587a4b299b18df0e2c558371722167;p=releng%2Fbuilder.git

diff --git a/jjb/ocpplugin/ocpplugin.yaml b/jjb/ocpplugin/ocpplugin.yaml
index c7169ae3f..496e31ec7 100644
--- a/jjb/ocpplugin/ocpplugin.yaml
+++ b/jjb/ocpplugin/ocpplugin.yaml
@@ -1,76 +1,35 @@
 ---
 - project:
-    name: ocpplugin-oxygen
+    name: ocpplugin-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'ocpplugin'
     project-name: 'ocpplugin'
     branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'ocpplugin-settings'
-    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-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'ocpplugin'
-    project-name: 'ocpplugin'
-    branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'ocpplugin-settings'
     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-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
-    stream: carbon
+    stream: oxygen
     project: 'ocpplugin'
     project-name: 'ocpplugin'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
     mvn-settings: 'ocpplugin-settings'
     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