Merge "Use larger heap size for distribution SFT"

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

diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml
index 010cc886df2d8a2e73dbaadcd0b8073e74220b07..1cd045d9136c8b8fec400d3d44180899cdcbc3db 100644 (file)
--- a/jjb/aaa/aaa.yaml
+++ b/jjb/aaa/aaa.yaml
@@ -1,15 +1,14 @@
 ---
 - project:
-    name: aaa-nitrogen
+    name: aaa-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: 'aaa'
     project-name: 'aaa'
     branch: 'master'
@@ -27,21 +26,18 @@
     archive-artifacts: ''
 
 - project:
-    name: aaa-carbon
+    name: aaa-nitrogen
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: carbon
+    stream: nitrogen
     project: 'aaa'
     project-name: 'aaa'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
+    branch: 'stable/nitrogen'
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -56,19 +52,18 @@
     archive-artifacts: ''
 
 - project:
-    name: aaa-boron
+    name: aaa-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: 'aaa'
     project-name: 'aaa'
-    branch: 'stable/boron'
+    branch: 'stable/carbon'
     karaf-version: karaf3
     jdk: openjdk8
     jdks:
@@ -84,23 +79,22 @@
     archive-artifacts: ''
 
 - project:
-    name: aaa-beryllium
+    name: aaa-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: 'aaa'
     project-name: 'aaa'
-    branch: 'stable/beryllium'
+    branch: 'stable/boron'
     karaf-version: karaf3
-    jdk: openjdk7
+    jdk: openjdk8
     jdks:
-      - openjdk7
+      - openjdk8
     maven:
       - mvn33:
           mvn-version: 'mvn33'