Merge "Remove all Neon jobs"

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

diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml
index c42101443a58716977972cd087d7fe89a4c1ebaa..dab038e5f3c876809644b65255c14a377a751f50 100644 (file)
--- a/jjb/neutron/neutron.yaml
+++ b/jjb/neutron/neutron.yaml
@@ -1,38 +1,20 @@
 ---
 - project:
-    name: neutron-sodium
+    name: neutron-aluminium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
 
-    stream: sodium
+    stream: aluminium
     project: 'neutron'
     project-name: 'neutron'
     build-timeout: 90
     branch: 'master'
+    java-version: 'openjdk11'
     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:
-      - '{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'
+    mvn-opts: '-Xmx1024m'
     dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}'
     email-upstream: '[neutron] [odlparent] [aaa]'
 
@@ -40,40 +22,42 @@
     staging-profile-id: a67e1b40d7419
 
 - project:
-    name: neutron-fluorine
+    name: neutron-magnesium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
 
-    stream: fluorine
+    stream: magnesium
     project: 'neutron'
     project-name: 'neutron'
     build-timeout: 90
-    branch: 'stable/fluorine'
+    branch: 'stable/magnesium'
+    java-version: 'openjdk11'
     mvn-settings: 'neutron-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
     dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}'
     email-upstream: '[neutron] [odlparent] [aaa]'
-    disable-job: true
 
     # Used by the release job
     staging-profile-id: a67e1b40d7419
 
 - project:
-    name: neutron-oxygen
+    name: neutron-sodium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
-    stream: oxygen
+    stream: sodium
     project: 'neutron'
     project-name: 'neutron'
     build-timeout: 90
-    branch: 'stable/oxygen'
+    branch: 'stable/sodium'
     mvn-settings: 'neutron-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
     dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}'
     email-upstream: '[neutron] [odlparent] [aaa]'
 
@@ -87,8 +71,9 @@
     project: 'neutron'
     project-name: 'neutron'
     branch: 'master'
+    java-version: 'openjdk11'
     mvn-settings: 'neutron-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
 
 - project:
     name: neutron-view