X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fatrium%2Fatrium.yaml;h=7a9dad82bd555df5753aaff8492340c7e464c295;hb=d7c3880fe4578a70a16e2237bb8be8a1742c0291;hp=da93fc9707be11266e15837551a8220b4ac9c36b;hpb=29b2f25826a1d889aa515be1c39c40da83f7ae00;p=releng%2Fbuilder.git

diff --git a/jjb/atrium/atrium.yaml b/jjb/atrium/atrium.yaml
index da93fc970..7a9dad82b 100644
--- a/jjb/atrium/atrium.yaml
+++ b/jjb/atrium/atrium.yaml
@@ -2,17 +2,14 @@
 - project:
     name: atrium-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: 'atrium'
     project-name: 'atrium'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -25,20 +22,20 @@
     email-upstream: '[atrium]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 9324f12310e6a
+
 - project:
     name: atrium-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: 'atrium'
     project-name: 'atrium'
     branch: 'stable/nitrogen'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -51,21 +48,21 @@
     email-upstream: '[atrium]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 9324f12310e6a
+
 - project:
     name: atrium-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: 'atrium'
     project-name: 'atrium'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -78,37 +75,13 @@
     email-upstream: '[atrium]'
     archive-artifacts: ''
 
-- project:
-    name: atrium-boron
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: boron
-    project: 'atrium'
-    project-name: 'atrium'
-    branch: 'stable/boron'
-    karaf-version: karaf3
-    jdk: openjdk8
-    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
 
 - project:
     name: atrium-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'atrium'
     project-name: 'atrium'
     branch: 'master'