Do not specify jre or jdk if default value applies

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

diff --git a/jjb/genius/genius.yaml b/jjb/genius/genius.yaml
index dfa79ebd600e9006825a3a2974eafeec805a7fa8..9537c3e9d19022c8499e90e5bcc41e10f47904fc 100644 (file)
--- a/jjb/genius/genius.yaml
+++ b/jjb/genius/genius.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: genius-nitrogen
+    name: genius-oxygen
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
@@ -8,11 +8,10 @@
       - '{project-name}-merge-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: nitrogen
+    stream: oxygen
     project: 'genius'
     project-name: 'genius'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -31,7 +30,7 @@
     archive-artifacts: ''
 
 - project:
-    name: genius-carbon
+    name: genius-nitrogen
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
@@ -39,12 +38,10 @@
       - '{project-name}-merge-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: carbon
+    stream: nitrogen
     project: 'genius'
     project-name: 'genius'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    jdk: openjdk8
+    branch: 'stable/nitrogen'
     jdks:
       - openjdk8
     maven:
@@ -63,7 +60,7 @@
     archive-artifacts: ''
 
 - project:
-    name: genius-boron
+    name: genius-carbon
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
@@ -71,12 +68,11 @@
       - '{project-name}-merge-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: boron
+    stream: carbon
     project: 'genius'
     project-name: 'genius'
+    branch: 'stable/carbon'
     karaf-version: karaf3
-    branch: 'stable/boron'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven: