X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fcapwap%2Fcapwap.yaml;h=ed7c55974acef74738f032722437f1bf343b9b03;hb=0e0e34daa29f5cd386428cc72571b1e3dee6abfa;hp=bf5f301d19f497694affeaf01edb8fc066bda9fb;hpb=39a0450315a14058a0c8fd7eb8c53fad2637249f;p=releng%2Fbuilder.git

diff --git a/jjb/capwap/capwap.yaml b/jjb/capwap/capwap.yaml
index bf5f301d19..ed7c55974a 100644
--- a/jjb/capwap/capwap.yaml
+++ b/jjb/capwap/capwap.yaml
@@ -1,12 +1,10 @@
 ---
 - project:
-    name: capwap-oxygen
+    name: capwap-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'capwap'
     project-name: 'capwap'
     branch: 'master'
@@ -14,48 +12,24 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[capwap]'
-    archive-artifacts: ''
-
-    # Used by the release job
-    staging-profile-id: 96bd6b5bf86e3
-
-- project:
-    name: capwap-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'capwap'
-    project-name: 'capwap'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'capwap-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[capwap]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96bd6b5bf86e3
 
 - project:
-    name: capwap-carbon
+    name: capwap-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
-    stream: carbon
+    stream: oxygen
     project: 'capwap'
     project-name: 'capwap'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
+    branch: 'stable/oxygen'
     mvn-settings: 'capwap-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[capwap]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96bd6b5bf86e3