X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fcardinal%2Fcardinal.yaml;h=ba42c4da8822306b345e327768a313f9b2ddb344;hb=b4cf45c2f7b0f81a395a81f85718df294868429d;hp=8962ee4826ac05eff8329d57cbfba8736b8926cf;hpb=95d62ba8065ca3281fb2b6265411f6412fc67594;p=releng%2Fbuilder.git

diff --git a/jjb/cardinal/cardinal.yaml b/jjb/cardinal/cardinal.yaml
index 8962ee482..ba42c4da8 100644
--- a/jjb/cardinal/cardinal.yaml
+++ b/jjb/cardinal/cardinal.yaml
@@ -1,12 +1,10 @@
 ---
 - project:
-    name: cardinal-oxygen
+    name: cardinal-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'cardinal'
     project-name: 'cardinal'
     branch: 'master'
@@ -14,48 +12,24 @@
     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}'
-      - '{project-name}-integration-{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]'
-    archive-artifacts: ''
-
-    # Used by the release job
-    staging-profile-id: 96be20348f0f2
-
-- project:
-    name: cardinal-carbon
+    name: cardinal-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
-    stream: carbon
+    stream: oxygen
     project: 'cardinal'
     project-name: 'cardinal'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
+    branch: 'stable/oxygen'
     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]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96be20348f0f2
@@ -70,3 +44,9 @@
     branch: 'master'
     mvn-settings: 'cardinal-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- view:
+    name: cardinal
+    description: 'List of cardinal jobs'
+    regex: '^cardinal-.*'
+    <<: *releng_view_common