X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fcardinal%2Fcardinal.yaml;h=71b99503d6c45c9ac1a209642fd89686c69b6a5c;hb=f5611e3768895d4b4ca20c7719a2bd9fe5652fca;hp=34b2e7e7dadc0c4b3ac656debee6e3643f2f6760;hpb=3bd9ebb49a35331d940bb837bae8fd9d5c8040b8;p=releng%2Fbuilder.git

diff --git a/jjb/cardinal/cardinal.yaml b/jjb/cardinal/cardinal.yaml
index 34b2e7e7d..71b99503d 100644
--- a/jjb/cardinal/cardinal.yaml
+++ b/jjb/cardinal/cardinal.yaml
@@ -1,93 +1,66 @@
 ---
 - 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}'
+      - odl-maven-jobs
 
-    stream: nitrogen
+    stream: oxygen
     project: 'cardinal'
     project-name: 'cardinal'
     branch: 'master'
-    jdk: openjdk8
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'cardinal-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'openflowplugin-merge-{stream},iotdm-merge-{stream},sfc-merge-{stream}'
     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}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - odl-maven-jobs
 
-    stream: carbon
+    stream: nitrogen
     project: 'cardinal'
     project-name: 'cardinal'
-    branch: 'stable/carbon'
-    jdk: openjdk8
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/nitrogen'
     mvn-settings: 'cardinal-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'openflowplugin-merge-{stream},iotdm-merge-{stream},sfc-merge-{stream}'
     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}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - odl-maven-jobs
 
-    stream: boron
+    stream: carbon
     project: 'cardinal'
     project-name: 'cardinal'
-    branch: 'stable/boron'
-    jdk: openjdk8
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/carbon'
+    karaf-version: karaf3
     mvn-settings: 'cardinal-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'openflowplugin-merge-{stream},iotdm-merge-{stream},sfc-merge-{stream}'
     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'
     branch: 'master'
     mvn-settings: 'cardinal-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'