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 53aa3ef72da233143c98eb7c1059a9a91a657590..c42101443a58716977972cd087d7fe89a4c1ebaa 100644 (file)
--- a/jjb/neutron/neutron.yaml
+++ b/jjb/neutron/neutron.yaml
@@ -1,88 +1,81 @@
 ---
 - project:
-    name: neutron-oxygen
+    name: neutron-sodium
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
-    stream: oxygen
+    stream: sodium
     project: 'neutron'
     project-name: 'neutron'
     build-timeout: 90
     branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'neutron-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}'
     email-upstream: '[neutron] [odlparent] [aaa]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a67e1b40d7419
 
 - project:
-    name: neutron-nitrogen
+    name: neutron-neon
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
+
+    stream: neon
+    project: 'neutron'
+    project-name: 'neutron'
+    build-timeout: 90
+    branch: 'stable/neon'
+    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-fluorine
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
-    stream: nitrogen
+    stream: fluorine
     project: 'neutron'
     project-name: 'neutron'
-    build-timeout: 60
-    branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    build-timeout: 90
+    branch: 'stable/fluorine'
     mvn-settings: 'neutron-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}'
     email-upstream: '[neutron] [odlparent] [aaa]'
-    archive-artifacts: ''
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: a67e1b40d7419
 
 - project:
-    name: neutron-carbon
+    name: neutron-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
-    stream: carbon
+    stream: oxygen
     project: 'neutron'
     project-name: 'neutron'
-    build-timeout: 60
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    build-timeout: 90
+    branch: 'stable/oxygen'
     mvn-settings: 'neutron-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}'
     email-upstream: '[neutron] [odlparent] [aaa]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a67e1b40d7419
@@ -95,5 +88,10 @@
     project-name: 'neutron'
     branch: 'master'
     mvn-settings: 'neutron-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: neutron-view
+    views:
+      - project-view
+    project-name: neutron