X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fcardinal%2Fcardinal.yaml;h=3880e23be198d844ec3cf8231b4e34bb7a61c762;hb=ebb321f1aaa399dc574f0174541d6baed8af97cf;hp=f1d3fb98caaf6e36bdfb174ec077a08d196d4349;hpb=e4d04440ba14634e48b5a806d1c4273ff8c8edb1;p=releng%2Fbuilder.git

diff --git a/jjb/cardinal/cardinal.yaml b/jjb/cardinal/cardinal.yaml
index f1d3fb98c..3880e23be 100644
--- a/jjb/cardinal/cardinal.yaml
+++ b/jjb/cardinal/cardinal.yaml
@@ -1,20 +1,16 @@
 ---
 - project:
-    name: cardinal-nitrogen
+    name: cardinal-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{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'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -27,22 +23,21 @@
     email-upstream: '[cardinal] [openflowplugin] [iotdm] [sfc]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96be20348f0f2
+
 - project:
-    name: cardinal-carbon
+    name: cardinal-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{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'
-    karaf-version: karaf3
-    jdk: openjdk8
+    branch: 'stable/nitrogen'
     jdks:
       - openjdk8
     maven:
@@ -55,22 +50,22 @@
     email-upstream: '[cardinal] [openflowplugin] [iotdm] [sfc]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96be20348f0f2
+
 - project:
-    name: cardinal-boron
+    name: cardinal-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{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
     maven:
@@ -83,10 +78,13 @@
     email-upstream: '[cardinal] [openflowplugin] [iotdm] [sfc]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96be20348f0f2
+
 - project:
     name: cardinal-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
 
     project: 'cardinal'
     project-name: 'cardinal'