Remove odlparent-3.0.x jobs

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

diff --git a/jjb/cardinal/cardinal.yaml b/jjb/cardinal/cardinal.yaml
index 3db33a8229583bff49d0630952d8ba5ba6f4c933..24fad7f9afe868017b985e3869cc864a4fdbb070 100644 (file)
--- a/jjb/cardinal/cardinal.yaml
+++ b/jjb/cardinal/cardinal.yaml
@@ -1,10 +1,10 @@
 ---
 - project:
-    name: cardinal-fluorine
+    name: cardinal-neon
     jobs:
       - odl-maven-jobs
 
-    stream: fluorine
+    stream: neon
     project: 'cardinal'
     project-name: 'cardinal'
     branch: 'master'
@@ -17,33 +17,14 @@
     staging-profile-id: 96be20348f0f2
 
 - project:
-    name: cardinal-oxygen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: oxygen
-    project: 'cardinal'
-    project-name: 'cardinal'
-    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]'
-
-    # Used by the release job
-    staging-profile-id: 96be20348f0f2
-
-- project:
-    name: cardinal-nitrogen
+    name: cardinal-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
-    stream: nitrogen
+    stream: fluorine
     project: 'cardinal'
     project-name: 'cardinal'
-    branch: 'stable/nitrogen'
+    branch: 'stable/fluorine'
     mvn-settings: 'cardinal-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'openflowplugin-merge-{stream},iotdm-merge-{stream},sfc-merge-{stream}'
@@ -53,16 +34,15 @@
     staging-profile-id: 96be20348f0f2
 
 - project:
-    name: cardinal-carbon
+    name: cardinal-oxygen
     jobs:
       - '{project-name}-distribution-check-{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}'
@@ -81,3 +61,9 @@
     branch: 'master'
     mvn-settings: 'cardinal-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: cardinal-view
+    views:
+      - project-view
+    project-name: cardinal