X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fcardinal%2Fcardinal.yaml;h=58b08a2149baa1fac2c223f9c6a14b14af83353d;hb=4dd0f93bdcc602f444719a3b5c95a5447866af85;hp=1439ac4fdd937a90231b7bcd7043660e003b01b1;hpb=72407c7ddd175ebe7feab09d4ef817f298832df6;p=releng%2Fbuilder.git

diff --git a/jjb/cardinal/cardinal.yaml b/jjb/cardinal/cardinal.yaml
index 1439ac4fd..71b99503d 100644
--- a/jjb/cardinal/cardinal.yaml
+++ b/jjb/cardinal/cardinal.yaml
@@ -1,46 +1,66 @@
+---
 - project:
-    name: cardinal-boron
+    name: cardinal-oxygen
     jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
-        - '{project-name}-distribution-check-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-periodic-{stream}'
-        - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
-    stream:
-        - boron:
-            disable_autorelease: False
-            disable_distribution_check: False
+      - '{project-name}-distribution-check-{stream}'
+      - odl-maven-jobs
 
+    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 -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     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-nitrogen
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - odl-maven-jobs
+
+    stream: nitrogen
+    project: 'cardinal'
+    project-name: 'cardinal'
+    branch: 'stable/nitrogen'
+    mvn-settings: 'cardinal-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'openflowplugin-merge-{stream},iotdm-merge-{stream},sfc-merge-{stream}'
+    email-upstream: '[cardinal] [openflowplugin] [iotdm] [sfc]'
+
+    # Used by the release job
+    staging-profile-id: 96be20348f0f2
+
+- project:
+    name: cardinal-carbon
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - odl-maven-jobs
+
+    stream: carbon
+    project: 'cardinal'
+    project-name: 'cardinal'
+    branch: 'stable/carbon'
+    karaf-version: karaf3
+    mvn-settings: 'cardinal-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'openflowplugin-merge-{stream},iotdm-merge-{stream},sfc-merge-{stream}'
+    email-upstream: '[cardinal] [openflowplugin] [iotdm] [sfc]'
+
+    # 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 -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'