X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Faaa%2Faaa.yaml;h=98d4f58faa1d4f9102d0f5ae8a42eba6a43e005d;hb=ddbf3cde9195f2b3635318fed187269504853ab1;hp=f4e71ff3d92a1964e146a5acf0316d279282e303;hpb=d2dbe00f26c3fd709f069d917b6d466d7bda4115;p=releng%2Fbuilder.git

diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml
index f4e71ff3d..98d4f58fa 100644
--- a/jjb/aaa/aaa.yaml
+++ b/jjb/aaa/aaa.yaml
@@ -1,11 +1,11 @@
 ---
 - project:
-    name: aaa-fluorine
+    name: aaa-neon
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
-    stream: fluorine
+    stream: neon
     project: 'aaa'
     project-name: 'aaa'
     branch: 'master'
@@ -18,33 +18,15 @@
     staging-profile-id: 9318cf3c82c33
 
 - project:
-    name: aaa-oxygen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: oxygen
-    project: 'aaa'
-    project-name: 'aaa'
-    branch: 'stable/oxygen'
-    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-nitrogen
+    name: aaa-fluorine
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
-    stream: nitrogen
+    stream: fluorine
     project: 'aaa'
     project-name: 'aaa'
-    branch: 'stable/nitrogen'
+    branch: 'stable/fluorine'
     mvn-settings: 'aaa-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
@@ -54,16 +36,15 @@
     staging-profile-id: 9318cf3c82c33
 
 - project:
-    name: aaa-carbon
+    name: aaa-oxygen
     jobs:
       - '{project-name}-distribution-check-{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}'
@@ -82,3 +63,9 @@
     branch: 'master'
     mvn-settings: 'aaa-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- view:
+    name: aaa
+    description: 'List of aaa jobs'
+    regex: '^aaa-.*'
+    <<: *releng_view_common