Merge "Skip SFT during mdsal-sonar"

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

diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml
index f4f348edc26745d876e2a0421dfe222a5d44c86b..23f7620ca81b19c5dea9201f47a2914e425f2e57 100644 (file)
--- a/jjb/neutron/neutron.yaml
+++ b/jjb/neutron/neutron.yaml
@@ -1,12 +1,12 @@
 ---
 - project:
-    name: neutron-neon
+    name: neutron-sodium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
-    stream: neon
+    stream: sodium
     project: 'neutron'
     project-name: 'neutron'
     build-timeout: 90
@@ -20,17 +20,17 @@
     staging-profile-id: a67e1b40d7419
 
 - project:
-    name: neutron-fluorine
+    name: neutron-neon
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
-    stream: fluorine
+    stream: neon
     project: 'neutron'
     project-name: 'neutron'
     build-timeout: 90
-    branch: 'stable/fluorine'
+    branch: 'stable/neon'
     mvn-settings: 'neutron-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}'
@@ -40,21 +40,22 @@
     staging-profile-id: a67e1b40d7419
 
 - project:
-    name: neutron-oxygen
+    name: neutron-fluorine
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'neutron'
     project-name: 'neutron'
     build-timeout: 90
-    branch: 'stable/oxygen'
+    branch: 'stable/fluorine'
     mvn-settings: 'neutron-settings'
     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 +70,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