Merge "Remove topoprocessing from AR validate Oxygen"

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

diff --git a/jjb/didm/didm.yaml b/jjb/didm/didm.yaml
index 25e69bc5bd4afd1deb137ac3fadb4f9abd243a02..a9d2bb573de598f9cb59ade8ea3417cb3543443c 100644 (file)
--- a/jjb/didm/didm.yaml
+++ b/jjb/didm/didm.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: didm-nitrogen
+    name: didm-oxygen
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
@@ -8,7 +8,7 @@
       - '{project-name}-merge-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: nitrogen
+    stream: oxygen
     project: 'didm'
     project-name: 'didm'
     branch: 'master'
@@ -26,20 +26,18 @@
     archive-artifacts: ''
 
 - project:
-    name: didm-carbon
+    name: didm-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: 'didm'
     project-name: 'didm'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
+    branch: 'stable/nitrogen'
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -54,19 +52,18 @@
     archive-artifacts: ''
 
 - project:
-    name: didm-boron
+    name: didm-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: 'didm'
     project-name: 'didm'
-    branch: 'stable/boron'
+    branch: 'stable/carbon'
     karaf-version: karaf3
     jdk: openjdk8
     jdks: