Adjust for karaf 4 not happening in carbon

[releng/builder.git] / jjb / atrium / atrium.yaml

diff --git a/jjb/atrium/atrium.yaml b/jjb/atrium/atrium.yaml
index 04e31cf99b32ceed84e64f7e3b5a0abc1379a20e..f216efb5c1ca59b8a1d6cf538190819cd3e833bf 100644 (file)
--- a/jjb/atrium/atrium.yaml
+++ b/jjb/atrium/atrium.yaml
@@ -1,4 +1,32 @@
 ---
+- project:
+    name: atrium-nitrogen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-validate-autorelease-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: nitrogen
+    project: 'atrium'
+    project-name: 'atrium'
+    branch: 'master'
+    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: ''
+
 - project:
     name: atrium-carbon
     jobs:
@@ -12,7 +40,8 @@
     stream: carbon
     project: 'atrium'
     project-name: 'atrium'
-    branch: 'master'
+    branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -40,6 +69,7 @@
     project: 'atrium'
     project-name: 'atrium'
     branch: 'stable/boron'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8