Merge "Remove odlparent-3.0.x jobs"

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

diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml
index f4f348edc26745d876e2a0421dfe222a5d44c86b..c42101443a58716977972cd087d7fe89a4c1ebaa 100644 (file)
--- a/jjb/neutron/neutron.yaml
+++ b/jjb/neutron/neutron.yaml
@@ -1,4 +1,24 @@
 ---
+- project:
+    name: neutron-sodium
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
+
+    stream: sodium
+    project: 'neutron'
+    project-name: 'neutron'
+    build-timeout: 90
+    branch: 'master'
+    mvn-settings: 'neutron-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}'
+    email-upstream: '[neutron] [odlparent] [aaa]'
+
+    # Used by the release job
+    staging-profile-id: a67e1b40d7419
+
 - project:
     name: neutron-neon
     jobs:
@@ -10,7 +30,7 @@
     project: 'neutron'
     project-name: 'neutron'
     build-timeout: 90
-    branch: 'master'
+    branch: 'stable/neon'
     mvn-settings: 'neutron-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}'
@@ -35,6 +55,7 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}'
     email-upstream: '[neutron] [odlparent] [aaa]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: a67e1b40d7419
@@ -69,8 +90,8 @@
     mvn-settings: 'neutron-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: neutron
-    description: 'List of neutron jobs'
-    regex: '^neutron-.*'
-    <<: *releng_view_common
+- project:
+    name: neutron-view
+    views:
+      - project-view
+    project-name: neutron