Merge "Change names for duplicate neutron jobs"

modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml

@@ -1292,9 +1292,7 @@
       - '{pipeline}-tempest-dsvm-neutron{branch-designator}'
       - '{pipeline}-tempest-master-dsvm-neutron{branch-designator}'
       - '{pipeline}-tempest-dsvm-neutron-pg{branch-designator}'
-      - '{pipeline}-tempest-dsvm-neutron-isolated{branch-designator}'
       - '{pipeline}-tempest-dsvm-neutron-isolated-parallel{branch-designator}'
-      - '{pipeline}-tempest-dsvm-neutron-pg-isolated{branch-designator}'
       - '{pipeline}-tempest-dsvm-neutron-full{branch-designator}'
       - '{pipeline}-devstack-dsvm-cells{branch-designator}'
       - '{pipeline}-tempest-dsvm-cells{branch-designator}'

modules/openstack_project/files/jenkins_job_builder/config/projects.yaml

@@ -1000,6 +1000,16 @@
           node: 'devstack-precise || devstack-precise-check'
           branch-designator: ''
           branch-override: default
+      - devstack-jobs:
+          pipeline: gate
+          node: devstack-precise
+          branch-designator: '-2'
+          branch-override: default
+      - devstack-jobs:
+          pipeline: check
+          node: 'devstack-precise || devstack-precise-check'
+          branch-designator: '-2'
+          branch-override: default
 
 
 - project:

modules/openstack_project/files/zuul/layout.yaml

@@ -856,11 +856,11 @@ projects:
       - name: integrated-gate-neutron
     check:
       - check-neutron-dsvm-functional
-      - check-tempest-dsvm-neutron
+      - check-tempest-dsvm-neutron-2
-      - check-tempest-dsvm-neutron-pg
+      - check-tempest-dsvm-neutron-pg-2
     gate:
-      - gate-tempest-dsvm-neutron
+      - gate-tempest-dsvm-neutron-2
-      - gate-tempest-dsvm-neutron-pg
+      - gate-tempest-dsvm-neutron-pg-2
     experimental:
       - check-neutron-dsvm-api
       - gate-grenade-dsvm-neutron-forward