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 6ece2ce8b88ab5e685bcfa32e3b5232e99e17006..dab038e5f3c876809644b65255c14a377a751f50 100644 (file)
--- a/jjb/neutron/neutron.yaml
+++ b/jjb/neutron/neutron.yaml
@@ -1,13 +1,13 @@
 ---
 - project:
-    name: neutron-magnesium
+    name: neutron-aluminium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: magnesium
+    stream: aluminium
     project: 'neutron'
     project-name: 'neutron'
     build-timeout: 90
@@ -22,18 +22,19 @@
     staging-profile-id: a67e1b40d7419
 
 - project:
-    name: neutron-sodium
+    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: sodium
+    stream: magnesium
     project: 'neutron'
     project-name: 'neutron'
     build-timeout: 90
-    branch: 'stable/sodium'
+    branch: 'stable/magnesium'
+    java-version: 'openjdk11'
     mvn-settings: 'neutron-settings'
     mvn-opts: '-Xmx1024m'
     dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}'
@@ -43,18 +44,18 @@
     staging-profile-id: a67e1b40d7419
 
 - project:
-    name: neutron-neon
+    name: neutron-sodium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: neon
+    stream: sodium
     project: 'neutron'
     project-name: 'neutron'
     build-timeout: 90
-    branch: 'stable/neon'
+    branch: 'stable/sodium'
     mvn-settings: 'neutron-settings'
     mvn-opts: '-Xmx1024m'
     dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}'