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

diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml
index 772189a6f..f4e71ff3d 100644
--- a/jjb/aaa/aaa.yaml
+++ b/jjb/aaa/aaa.yaml
@@ -1,27 +1,36 @@
 ---
+- project:
+    name: aaa-fluorine
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - odl-maven-jobs
+
+    stream: fluorine
+    project: 'aaa'
+    project-name: 'aaa'
+    branch: 'master'
+    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-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'aaa'
     project-name: 'aaa'
-    branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
     mvn-settings: 'aaa-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[aaa] [odlparent] [yangtools] [controller]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 9318cf3c82c33
@@ -30,25 +39,16 @@
     name: aaa-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'aaa'
     project-name: 'aaa'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'aaa-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[aaa] [odlparent] [yangtools] [controller]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 9318cf3c82c33
@@ -57,26 +57,17 @@
     name: aaa-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'aaa'
     project-name: 'aaa'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'aaa-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[aaa] [odlparent] [yangtools] [controller]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 9318cf3c82c33
@@ -84,11 +75,10 @@
 - project:
     name: aaa-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
 
     project: 'aaa'
     project-name: 'aaa'
     branch: 'master'
     mvn-settings: 'aaa-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'