Merge "Revert "Archive all *.txt and *.xml surefire""

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

diff --git a/jjb/genius/genius.yaml b/jjb/genius/genius.yaml
index 9fa00f16ed98d255dd7da73cde879b38a6066f41..dfa79ebd600e9006825a3a2974eafeec805a7fa8 100644 (file)
--- a/jjb/genius/genius.yaml
+++ b/jjb/genius/genius.yaml
@@ -6,7 +6,6 @@
       - '{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
@@ -38,13 +37,13 @@
       - '{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: 'genius'
     project-name: 'genius'
     branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -70,12 +69,12 @@
       - '{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
     project: 'genius'
     project-name: 'genius'
+    karaf-version: karaf3
     branch: 'stable/boron'
     jdk: openjdk8
     jdks: