X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Faaa%2Faaa.yaml;h=8228470cb2662339f40964c8c4f0a0c7151aeb8f;hb=9d926f94fe3824189d4990b904c1807602ba7d85;hp=4885ca31fb2f3b1f8a9f678227e78f78549e251d;hpb=f9510ad2361a13149cd478e9d0863d0efe3dd772;p=releng%2Fbuilder.git

diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml
index 4885ca31f..8228470cb 100644
--- a/jjb/aaa/aaa.yaml
+++ b/jjb/aaa/aaa.yaml
@@ -2,90 +2,68 @@
 - project:
     name: aaa-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'aaa'
     project-name: 'aaa'
     branch: 'master'
-    jdk: openjdk8
-    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
 
 - project:
     name: aaa-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'aaa'
     project-name: 'aaa'
     branch: 'stable/nitrogen'
-    jdk: openjdk8
-    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
 
 - project:
     name: aaa-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'aaa'
     project-name: 'aaa'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
-    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
 
 - 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'