X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fcapwap%2Fcapwap.yaml;h=2e7a81e0632a18da1cb4fb1e8b7c2dc034633cde;hb=f9510ad2361a13149cd478e9d0863d0efe3dd772;hp=c9b3f09039b09be9c9f92e07d4d3b078315b5518;hpb=b87993e41f0d01a28d1bd2be20eafc5a2f052c54;p=releng%2Fbuilder.git

diff --git a/jjb/capwap/capwap.yaml b/jjb/capwap/capwap.yaml
index c9b3f0903..2e7a81e06 100644
--- a/jjb/capwap/capwap.yaml
+++ b/jjb/capwap/capwap.yaml
@@ -1,15 +1,14 @@
 ---
 - project:
-    name: capwap-carbon
+    name: capwap-oxygen
     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}'
 
-    stream: carbon
+    stream: oxygen
     project: 'capwap'
     project-name: 'capwap'
     branch: 'master'
@@ -27,19 +26,18 @@
     archive-artifacts: ''
 
 - project:
-    name: capwap-boron
+    name: capwap-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}'
 
-    stream: boron
+    stream: nitrogen
     project: 'capwap'
     project-name: 'capwap'
-    branch: 'stable/boron'
+    branch: 'stable/nitrogen'
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -54,22 +52,21 @@
     archive-artifacts: ''
 
 - project:
-    name: capwap-beryllium
+    name: capwap-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}'
 
-    stream: beryllium
+    stream: carbon
     project: 'capwap'
     project-name: 'capwap'
-    branch: 'stable/beryllium'
-    jdk: openjdk7
+    branch: 'stable/carbon'
+    karaf-version: karaf3
+    jdk: openjdk8
     jdks:
-      - openjdk7
       - openjdk8
     maven:
       - mvn33: