Adjust for karaf 4 not happening in carbon

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

diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml
index 6e84bea1f63391a8bc07aa892620b3fa1a717a1f..7076499bd90d133452dfc71bcf7d313acef69b44 100644 (file)
--- a/jjb/odlparent/odlparent.yaml
+++ b/jjb/odlparent/odlparent.yaml
@@ -1,4 +1,33 @@
 ---
+- project:
+    name: odlparent-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}'
+      - '{project-name}-verify-tox-{stream}'
+
+    stream: nitrogen
+    project: 'odlparent'
+    project-name: 'odlparent'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'odlparent-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[odlparent]'
+    archive-artifacts: ''
+
 - project:
     name: odlparent-carbon
     jobs:
@@ -13,7 +42,8 @@
     stream: carbon
     project: 'odlparent'
     project-name: 'odlparent'
-    branch: 'master'
+    branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -41,6 +71,7 @@
     project: 'odlparent'
     project-name: 'odlparent'
     branch: 'stable/boron'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -68,6 +99,7 @@
     project: 'odlparent'
     project-name: 'odlparent'
     branch: 'stable/beryllium'
+    karaf-version: karaf3
     jdk: openjdk7
     jdks:
       - openjdk7