X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fatrium%2Fatrium.yaml;h=18ba43f83ac23e3e2c4cc6829e01f12b48334b5a;hb=ebb321f1aaa399dc574f0174541d6baed8af97cf;hp=40e656462ad5c1e56b36ec3e8fd62c95b939e75f;hpb=b5776355cc7efca94a42ae1ddf98c324dbdabe75;p=releng%2Fbuilder.git

diff --git a/jjb/atrium/atrium.yaml b/jjb/atrium/atrium.yaml
index 40e656462..aa3c6139d 100644
--- a/jjb/atrium/atrium.yaml
+++ b/jjb/atrium/atrium.yaml
@@ -1,32 +1,93 @@
-# ODL Releng build templates
+---
 - project:
-    name: atrium
+    name: atrium-oxygen
     jobs:
-        - '{name}-clm-{stream}'
-        - '{name}-distribution-{stream}'
-        - '{name}-distribution-check-{stream}'
-        - '{name}-integration-{stream}'
-        - '{name}-merge-{stream}'
-        - '{name}-periodic-{stream}'
-        - '{name}-sonar'
-        - '{name}-validate-autorelease-{stream}'
-        - '{name}-verify-{stream}'
-
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
-    stream:
-        - boron:
-            branch: 'master'
-            jdk: openjdk8
-            jdks:
-                - openjdk8
-            disable_autorelease: True
-            disable_distribution_check: False
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
+      - '{project-name}-merge-{stream}'
 
+    stream: oxygen
     project: 'atrium'
+    project-name: 'atrium'
+    branch: 'master'
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
     mvn-settings: 'atrium-settings'
-    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
+    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-nitrogen
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
+      - '{project-name}-merge-{stream}'
+
+    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
+
+- project:
+    name: atrium-carbon
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
+      - '{project-name}-merge-{stream}'
+
+    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:
+      - gerrit-maven-sonar
+    project: 'atrium'
+    project-name: 'atrium'
+    branch: 'master'
+    mvn-settings: 'atrium-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'