Do not specify jre or jdk if default value applies

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

diff --git a/jjb/alto/alto.yaml b/jjb/alto/alto.yaml
index e9fe7bb41ce6ebe3dfe446d43d3e8923fb9e8ddf..ad6eb69cd91d4961729ab6c6473f5ad66fdfe969 100644 (file)
--- a/jjb/alto/alto.yaml
+++ b/jjb/alto/alto.yaml
@@ -1,19 +1,17 @@
 ---
 - project:
-    name: alto-carbon
+    name: alto-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: carbon
+    stream: oxygen
     project: 'alto'
     project-name: 'alto'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -27,20 +25,18 @@
     archive-artifacts: ''
 
 - project:
-    name: alto-boron
+    name: alto-nitrogen
     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: nitrogen
     project: 'alto'
     project-name: 'alto'
-    branch: 'stable/boron'
-    jdk: openjdk8
+    branch: 'stable/nitrogen'
     jdks:
       - openjdk8
     maven:
@@ -54,22 +50,20 @@
     archive-artifacts: ''
 
 - project:
-    name: alto-beryllium
+    name: alto-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: beryllium
+    stream: carbon
     project: 'alto'
     project-name: 'alto'
-    branch: 'stable/beryllium'
-    jdk: openjdk7
+    branch: 'stable/carbon'
+    karaf-version: karaf3
     jdks:
-      - openjdk7
       - openjdk8
     maven:
       - mvn33: