Merge "Update cloud image Ubuntu18.04 mininet ovs"

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

diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml
index 0e95f91d9d7add911f96965af10ba9e6438d5cce..1c4fdb1b1c238026de6e754ac57f1b4956c6210e 100644 (file)
--- a/jjb/neutron/neutron.yaml
+++ b/jjb/neutron/neutron.yaml
@@ -1,13 +1,12 @@
 ---
 - project:
-    name: neutron-phosphorus
+    name: neutron-master
     jobs:
-      - "{project-name}-distribution-check-{stream}"
       - "{project-name}-maven-javadoc-jobs"
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: phosphorus
+    stream: master
     project: "neutron"
     project-name: "neutron"
     build-timeout: 90
@@ -15,73 +14,6 @@
     java-version: "openjdk11"
     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-silicon
-    jobs:
-      - "{project-name}-distribution-check-{stream}"
-      - "{project-name}-maven-javadoc-jobs"
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
-
-    stream: silicon
-    project: "neutron"
-    project-name: "neutron"
-    build-timeout: 90
-    branch: "stable/silicon"
-    java-version: "openjdk11"
-    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-aluminium
-    jobs:
-      - "{project-name}-distribution-check-{stream}"
-      - "{project-name}-maven-javadoc-jobs"
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
-
-    stream: aluminium
-    project: "neutron"
-    project-name: "neutron"
-    build-timeout: 90
-    branch: "stable/aluminium"
-    java-version: "openjdk11"
-    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-magnesium
-    jobs:
-      - "{project-name}-distribution-check-{stream}"
-      - "{project-name}-maven-javadoc-jobs"
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
-
-    stream: magnesium
-    project: "neutron"
-    project-name: "neutron"
-    build-timeout: 90
-    branch: "stable/magnesium"
-    java-version: "openjdk11"
-    mvn-settings: "neutron-settings"
-    mvn-opts: "-Xmx1024m"
-    dependencies: "odlparent-merge-{stream},aaa-merge-{stream}"
     email-upstream: "[neutron] [odlparent] [aaa]"
 
     # Used by the release job