Merge "Adjust netvirt jobs"

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

diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml
index 2986e88b0f27eb8406a3171357286a43747c16a9..9c80a472e7de93d3e684c80fa724b5060ef0aabb 100644 (file)
--- a/jjb/neutron/neutron.yaml
+++ b/jjb/neutron/neutron.yaml
@@ -1,13 +1,13 @@
 ---
 - project:
-    name: neutron-silicon
+    name: neutron-phosphorus
     jobs:
       - "{project-name}-distribution-check-{stream}"
       - "{project-name}-maven-javadoc-jobs"
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: silicon
+    stream: phosphorus
     project: "neutron"
     project-name: "neutron"
     build-timeout: 90
@@ -22,18 +22,18 @@
     staging-profile-id: a67e1b40d7419
 
 - project:
-    name: neutron-aluminium
+    name: neutron-silicon
     jobs:
       - "{project-name}-distribution-check-{stream}"
       - "{project-name}-maven-javadoc-jobs"
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: aluminium
+    stream: silicon
     project: "neutron"
     project-name: "neutron"
     build-timeout: 90
-    branch: "stable/aluminium"
+    branch: "stable/silicon"
     java-version: "openjdk11"
     mvn-settings: "neutron-settings"
     mvn-opts: "-Xmx1024m"
@@ -44,18 +44,18 @@
     staging-profile-id: a67e1b40d7419
 
 - 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
-    branch: "stable/magnesium"
+    branch: "stable/aluminium"
     java-version: "openjdk11"
     mvn-settings: "neutron-settings"
     mvn-opts: "-Xmx1024m"
@@ -65,27 +65,6 @@
     # Used by the release job
     staging-profile-id: a67e1b40d7419
 
-- project:
-    name: neutron-sodium
-    jobs:
-      - "{project-name}-distribution-check-{stream}"
-      - "{project-name}-maven-javadoc-jobs"
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-
-    stream: sodium
-    project: "neutron"
-    project-name: "neutron"
-    build-timeout: 90
-    branch: "stable/sodium"
-    mvn-settings: "neutron-settings"
-    mvn-opts: "-Xmx1024m"
-    dependencies: "odlparent-merge-{stream},aaa-merge-{stream}"
-    email-upstream: "[neutron] [odlparent] [aaa]"
-
-    # Used by the release job
-    staging-profile-id: a67e1b40d7419
-
 - project:
     name: neutron-sonar
     jobs: