Merge "Remove reservation carbon jobs"

[releng/builder.git] / jjb / honeycomb / vbd / vbd.yaml

diff --git a/jjb/honeycomb/vbd/vbd.yaml b/jjb/honeycomb/vbd/vbd.yaml
index f2e35f98a1793d155b8efb02c4f8fa4e272236d0..ec193bb095994a1efec9e1bf61fd81eac49649dd 100644 (file)
--- a/jjb/honeycomb/vbd/vbd.yaml
+++ b/jjb/honeycomb/vbd/vbd.yaml
@@ -1,11 +1,10 @@
 ---
 - project:
-    name: vbd-oxygen
+    name: vbd-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'honeycomb/vbd'
     project-name: 'vbd'
     branch: 'master'
@@ -18,15 +17,15 @@
     staging-profile-id: 96fc362c36862
 
 - project:
-    name: vbd-nitrogen
+    name: vbd-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
-    stream: nitrogen
+    stream: oxygen
     project: 'honeycomb/vbd'
     project-name: 'vbd'
-    branch: 'stable/nitrogen'
+    branch: 'stable/oxygen'
     mvn-settings: 'honeycomb-vbd-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
@@ -36,16 +35,15 @@
     staging-profile-id: 96fc362c36862
 
 - project:
-    name: vbd-carbon
+    name: vbd-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
-    stream: carbon
+    stream: nitrogen
     project: 'honeycomb/vbd'
     project-name: 'vbd'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
+    branch: 'stable/nitrogen'
     mvn-settings: 'honeycomb-vbd-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''