X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Faaa%2Faaa.yaml;h=1a60b2883dd0ccef8647c31a4ebb540d7e25235c;hb=0e0e34daa29f5cd386428cc72571b1e3dee6abfa;hp=8228470cb2662339f40964c8c4f0a0c7151aeb8f;hpb=45dda826d667777fa16b4e937bce5e736cdcfa3c;p=releng%2Fbuilder.git

diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml
index 8228470cb..1a60b2883 100644
--- a/jjb/aaa/aaa.yaml
+++ b/jjb/aaa/aaa.yaml
@@ -1,12 +1,11 @@
 ---
 - project:
-    name: aaa-oxygen
+    name: aaa-fluorine
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'aaa'
     project-name: 'aaa'
     branch: 'master'
@@ -19,36 +18,15 @@
     staging-profile-id: 9318cf3c82c33
 
 - project:
-    name: aaa-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'aaa'
-    project-name: 'aaa'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'aaa-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[aaa] [odlparent] [yangtools] [controller]'
-
-    # Used by the release job
-    staging-profile-id: 9318cf3c82c33
-
-- project:
-    name: aaa-carbon
+    name: aaa-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
-    stream: carbon
+    stream: oxygen
     project: 'aaa'
     project-name: 'aaa'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
+    branch: 'stable/oxygen'
     mvn-settings: 'aaa-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'