X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fatrium%2Fatrium.yaml;h=ea1f621abcc506ed22dc478e823f000da784695b;hb=9d926f94fe3824189d4990b904c1807602ba7d85;hp=aa3c6139d6ec1e6ff4733e3566014c08a87d180d;hpb=3c58e6f3d790405107a895a5bca46b191b4385be;p=releng%2Fbuilder.git

diff --git a/jjb/atrium/atrium.yaml b/jjb/atrium/atrium.yaml
index aa3c6139d..ea1f621ab 100644
--- a/jjb/atrium/atrium.yaml
+++ b/jjb/atrium/atrium.yaml
@@ -4,24 +4,16 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'atrium'
     project-name: 'atrium'
     branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'atrium-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[atrium]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 9324f12310e6a
@@ -31,24 +23,16 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'atrium'
     project-name: 'atrium'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'atrium-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[atrium]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 9324f12310e6a
@@ -58,25 +42,17 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'atrium'
     project-name: 'atrium'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'atrium-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[atrium]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 9324f12310e6a
@@ -89,5 +65,4 @@
     project-name: 'atrium'
     branch: 'master'
     mvn-settings: 'atrium-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'