X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fatrium%2Fatrium.yaml;h=7a9dad82bd555df5753aaff8492340c7e464c295;hb=580538afd2795b61a826ccd08195628c729d63cb;hp=18ba43f83ac23e3e2c4cc6829e01f12b48334b5a;hpb=cf2d5b7df1cbcc94c0ff0ca305ff3c347c0498d6;p=releng%2Fbuilder.git

diff --git a/jjb/atrium/atrium.yaml b/jjb/atrium/atrium.yaml
index 18ba43f83..7a9dad82b 100644
--- a/jjb/atrium/atrium.yaml
+++ b/jjb/atrium/atrium.yaml
@@ -1,24 +1,20 @@
+---
 - project:
-    name: atrium-carbon
+    name: atrium-oxygen
     jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
-        - '{project-name}-distribution-check-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - odl-maven-jobs
 
-    stream: carbon
+    stream: oxygen
     project: 'atrium'
     project-name: 'atrium'
     branch: 'master'
-    jdk: openjdk8
     jdks:
-        - openjdk8
+      - openjdk8
     maven:
-        - mvn33:
-            mvn-version: 'mvn33'
+      - mvn33:
+          mvn-version: 'mvn33'
     mvn-settings: 'atrium-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -26,27 +22,25 @@
     email-upstream: '[atrium]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 9324f12310e6a
+
 - project:
-    name: atrium-boron
+    name: atrium-nitrogen
     jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
-        - '{project-name}-distribution-check-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - odl-maven-jobs
 
-    stream: boron
+    stream: nitrogen
     project: 'atrium'
     project-name: 'atrium'
-    branch: 'stable/boron'
-    jdk: openjdk8
+    branch: 'stable/nitrogen'
     jdks:
-        - openjdk8
+      - openjdk8
     maven:
-        - mvn33:
-            mvn-version: 'mvn33'
+      - mvn33:
+          mvn-version: 'mvn33'
     mvn-settings: 'atrium-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -54,10 +48,40 @@
     email-upstream: '[atrium]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 9324f12310e6a
+
+- project:
+    name: atrium-carbon
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{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
+
 - project:
     name: atrium-sonar
     jobs:
-        - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'atrium'
     project-name: 'atrium'
     branch: 'master'