Adjust for karaf 4 not happening in carbon

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

diff --git a/jjb/bier/bier.yaml b/jjb/bier/bier.yaml
index 8175424ca84ab7e091353dcd766b5c899c2cf492..f8383a8b8c85e012784d0490a059fab402e5faad 100644 (file)
--- a/jjb/bier/bier.yaml
+++ b/jjb/bier/bier.yaml
@@ -1,40 +1,68 @@
-- project:\r
-    name: bier-carbon\r
-    jobs:\r
-        - '{project-name}-clm-{stream}'\r
-        - '{project-name}-distribution-{stream}'\r
-        - '{project-name}-distribution-check-{stream}'\r
-        - '{project-name}-integration-{stream}'\r
-        - '{project-name}-merge-{stream}'\r
-        - '{project-name}-periodic-{stream}'\r
-        - '{project-name}-validate-autorelease-{stream}'\r
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'\r
-\r
-    stream: carbon\r
-    project: 'bier'\r
-    project-name: 'bier'\r
-    branch: 'master'\r
-    jdk: openjdk8\r
-    jdks:\r
-        - openjdk8\r
-    maven:\r
-        - mvn33:\r
-            mvn-version: 'mvn33'\r
-    mvn-settings: 'bier-settings'\r
-    mvn-goals: 'clean install'\r
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'\r
-    dependencies: ''\r
-    email-upstream: '[bier]'\r
-    archive-artifacts: ''\r
-\r
-- project:\r
-    name: bier-sonar\r
-    jobs:\r
-        - '{project-name}-sonar'\r
-\r
-    project: 'bier'\r
-    project-name: 'bier'\r
-    branch: 'master'\r
-    mvn-settings: 'bier-settings'\r
-    mvn-goals: 'clean install'\r
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'\r
+---
+- project:
+    name: bier-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: 'bier'
+    project-name: 'bier'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'bier-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[bier]'
+    archive-artifacts: ''
+
+- project:
+    name: bier-carbon
+    jobs:
+      - '{project-name}-clm-{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}'
+
+    stream: carbon
+    project: 'bier'
+    project-name: 'bier'
+    branch: 'stable/carbon'
+    karaf-version: karaf3
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'bier-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[bier]'
+    archive-artifacts: ''
+
+- project:
+    name: bier-sonar
+    jobs:
+      - '{project-name}-sonar'
+
+    project: 'bier'
+    project-name: 'bier'
+    branch: 'master'
+    mvn-settings: 'bier-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'