Adjust for karaf 4 not happening in carbon

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

diff --git a/jjb/iotdm/iotdm.yaml b/jjb/iotdm/iotdm.yaml
index 65488ba159c9a7b12cd285f733ae85c35af9a75b..166a85a8b7f31640142bfc9d2dfff0d16c1e47e3 100644 (file)
--- a/jjb/iotdm/iotdm.yaml
+++ b/jjb/iotdm/iotdm.yaml
@@ -1,15 +1,16 @@
 ---
 - project:
-    name: iotdm-carbon
+    name: iotdm-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: carbon
+    stream: nitrogen
     project: 'iotdm'
     project-name: 'iotdm'
     branch: 'master'
@@ -26,6 +27,35 @@
     email-upstream: '[iotdm] [aaa]'
     archive-artifacts: ''
 
+- project:
+    name: iotdm-carbon
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      # TODO uncomment this line when IoTDM added to Carbon
+      # - '{project-name}-validate-autorelease-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: carbon
+    project: 'iotdm'
+    project-name: 'iotdm'
+    branch: 'stable/carbon'
+    karaf-version: karaf3
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'iotdm-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'aaa-merge-{stream}'
+    email-upstream: '[iotdm] [aaa]'
+    archive-artifacts: ''
+
 - project:
     name: iotdm-boron
     jobs:
@@ -40,6 +70,7 @@
     project: 'iotdm'
     project-name: 'iotdm'
     branch: 'stable/boron'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -67,6 +98,7 @@
     project: 'iotdm'
     project-name: 'iotdm'
     branch: 'stable/beryllium'
+    karaf-version: karaf3
     jdk: openjdk7
     jdks:
       - openjdk7