Remove redundant job to stop running the same tests

gate-neutron-fwaas-dsvm-api and gate-neutron-fwaas-dsvm-functional
runs the same tests. This is incorrect. Remove one of them to run
the correct job at neutron-fwaas gate

Change-Id: I4c9d4c90f193073dce2cd91dde7f458f91a830fc

jenkins/jobs/neutron-fwaas.yaml

@@ -76,49 +76,3 @@
       - test-results
       - devstack-logs
       - console-log
-
-- job-template:
-    name: '{pipeline}-neutron-fwaas-dsvm-api{job-suffix}'
-    node: '{node}'
-
-    wrappers:
-      - build-timeout:
-          timeout: 130
-      - timestamps
-
-    builders:
-      - print-template-name:
-          template-name: "{template-name}"
-      - link-logs
-      - net-info
-      - devstack-checkout
-      - shell: |
-          #!/bin/bash -xe
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_UNSTACK=1
-          export DEVSTACK_GATE_TEMPEST=0
-          export DEVSTACK_GATE_EXERCISES=0
-          export DEVSTACK_GATE_NEUTRON=1
-          export DEVSTACK_GATE_INSTALL_TESTONLY=1
-          export BRANCH_OVERRIDE={branch-override}
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          fi
-
-          function gate_hook {{
-              bash -xe $BASE/new/neutron-fwaas/neutron_fwaas/tests/contrib/gate_hook.sh dsvm-functional
-          }}
-          export -f gate_hook
-
-          function post_test_hook {{
-             bash -xe $BASE/new/neutron-fwaas/neutron_fwaas/tests/contrib/post_test_hook.sh dsvm-functional
-          }}
-          export -f post_test_hook
-
-          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
-          ./safe-devstack-vm-gate-wrap.sh
-
-    publishers:
-      - test-results
-      - devstack-logs
-      - console-log

jenkins/jobs/projects.yaml

@@ -3642,11 +3642,6 @@
       - python-liberty-bitrot-jobs
       - openstack-publish-jobs
       - openstack-releasenotes-jobs
-      - '{pipeline}-neutron-fwaas-dsvm-api{job-suffix}':
-          pipeline: gate
-          node: devstack-trusty
-          job-suffix: ''
-          branch-override: default
       - '{pipeline}-neutron-fwaas-dsvm-functional{job-suffix}':
           pipeline: gate
           node: devstack-trusty

zuul/layout.yaml

@@ -7041,7 +7041,6 @@ projects:
     experimental:
       - gate-neutron-fwaas-pep8-constraints
       - gate-neutron-fwaas-docs-constraints
-      - gate-neutron-fwaas-dsvm-api
       - gate-neutron-fwaas-dsvm-functional
       - gate-neutron-fwaas-dsvm-tempest