Merge "Generate versions.csv for autorelease builds"

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

diff --git a/jjb/iotdm/iotdm.yaml b/jjb/iotdm/iotdm.yaml
index b69daa0f9c7910c6f3da97d6d04d1c720ef74ae5..526fd4efc72565fcfa43585ee9a28fa21c8e99d8 100644 (file)
--- a/jjb/iotdm/iotdm.yaml
+++ b/jjb/iotdm/iotdm.yaml
@@ -1,15 +1,14 @@
 ---
 - project:
-    name: iotdm-nitrogen
+    name: iotdm-oxygen
     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: nitrogen
+    stream: oxygen
     project: 'iotdm'
     project-name: 'iotdm'
     branch: 'master'
@@ -27,22 +26,18 @@
     archive-artifacts: ''
 
 - project:
-    name: iotdm-carbon
+    name: iotdm-nitrogen
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{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
+    stream: nitrogen
     project: 'iotdm'
     project-name: 'iotdm'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
+    branch: 'stable/nitrogen'
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -57,19 +52,18 @@
     archive-artifacts: ''
 
 - project:
-    name: iotdm-boron
+    name: iotdm-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: boron
+    stream: carbon
     project: 'iotdm'
     project-name: 'iotdm'
-    branch: 'stable/boron'
+    branch: 'stable/carbon'
     karaf-version: karaf3
     jdk: openjdk8
     jdks:
@@ -85,23 +79,21 @@
     archive-artifacts: ''
 
 - project:
-    name: iotdm-beryllium
+    name: iotdm-boron
     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: beryllium
+    stream: boron
     project: 'iotdm'
     project-name: 'iotdm'
-    branch: 'stable/beryllium'
+    branch: 'stable/boron'
     karaf-version: karaf3
-    jdk: openjdk7
+    jdk: openjdk8
     jdks:
-      - openjdk7
       - openjdk8
     maven:
       - mvn33: