Merge "Remove topoprocessing from AR validate Oxygen"

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

diff --git a/jjb/cardinal/cardinal.yaml b/jjb/cardinal/cardinal.yaml
index 34b2e7e7dadc0c4b3ac656debee6e3643f2f6760..29610f47fd941f8c126c512c67a300b3e960844d 100644 (file)
--- a/jjb/cardinal/cardinal.yaml
+++ b/jjb/cardinal/cardinal.yaml
@@ -1,15 +1,14 @@
 ---
 - project:
-    name: cardinal-nitrogen
+    name: cardinal-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: 'cardinal'
     project-name: 'cardinal'
     branch: 'master'
@@ -27,19 +26,18 @@
     archive-artifacts: ''
 
 - project:
-    name: cardinal-carbon
+    name: cardinal-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: carbon
+    stream: nitrogen
     project: 'cardinal'
     project-name: 'cardinal'
-    branch: 'stable/carbon'
+    branch: 'stable/nitrogen'
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -54,19 +52,19 @@
     archive-artifacts: ''
 
 - project:
-    name: cardinal-boron
+    name: cardinal-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: 'cardinal'
     project-name: 'cardinal'
-    branch: 'stable/boron'
+    branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8