Merge "Remove messaging4transport carbon jobs"

[releng/builder.git] / jjb / aaa / aaa.yaml

diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml
index 9ce1c94c556ec7f35e318211788d2a22131b6020..129604754080692f4c89a586ef41ef1af58e2511 100644 (file)
--- a/jjb/aaa/aaa.yaml
+++ b/jjb/aaa/aaa.yaml
@@ -1,11 +1,11 @@
 ---
 - project:
-    name: aaa-oxygen
+    name: aaa-fluorine
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'aaa'
     project-name: 'aaa'
     branch: 'master'
@@ -18,15 +18,15 @@
     staging-profile-id: 9318cf3c82c33
 
 - project:
-    name: aaa-nitrogen
+    name: aaa-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
-    stream: nitrogen
+    stream: oxygen
     project: 'aaa'
     project-name: 'aaa'
-    branch: 'stable/nitrogen'
+    branch: 'stable/oxygen'
     mvn-settings: 'aaa-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
@@ -36,16 +36,15 @@
     staging-profile-id: 9318cf3c82c33
 
 - project:
-    name: aaa-carbon
+    name: aaa-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
-    stream: carbon
+    stream: nitrogen
     project: 'aaa'
     project-name: 'aaa'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
+    branch: 'stable/nitrogen'
     mvn-settings: 'aaa-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'