Merge "Remove odlparent-9.0.x jobs"

[releng/builder.git] / jjb / neutron / neutron-patch-test.yaml

diff --git a/jjb/neutron/neutron-patch-test.yaml b/jjb/neutron/neutron-patch-test.yaml
index c0512be767a1dc733331092473665cc241ee9dab..cb7332c164929fd9847a9fd2d8657b5aed2fbb0e 100644 (file)
--- a/jjb/neutron/neutron-patch-test.yaml
+++ b/jjb/neutron/neutron-patch-test.yaml
@@ -4,31 +4,24 @@
     jobs:
       - inttest-patch-test
 
-    project: 'neutron'
+    project: "neutron"
 
     stream:
-      - silicon:
-          branch: 'master'
-      - aluminium:
-          branch: 'stable/aluminium'
-      - magnesium:
-          branch: 'stable/magnesium'
-      - sodium:
-          branch: 'stable/sodium'
+      - chlorine:
+          branch: "master"
+          mvn-version: "mvn38"
+      - sulfur:
+          branch: "stable/sulfur"
+          mvn-version: "mvn38"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          mvn-version: "mvn35"
 
-    os-branch: 'queens'
+    os-branch: "queens"
 
-    jdk: 'openjdk8'
+    jdk: "openjdk8"
 
     feature:
-      - netvirt:
-          csit-list: >
-              netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream}
-
-      - cluster-netvirt:
-          csit-list: >
-              netvirt-csit-3node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream}
-
       - genius:
           csit-list: >
-              genius-csit-1node-gate-only-{stream}
+            genius-csit-1node-gate-only-{stream}