Remove {pipeline}-cinder-dsvm-apache-{node}{suffix}

With the new switch to using uWSGI, we no longer need a separate
job to run Cinder with Apache. This removes the job completely,
including for stable branches pre-uWSGI, since it has never failed
and with stable policy it is highly unlikely we would change
anything there that could break it now. Easier just cleaning it
all up at this point.

Change-Id: I7b49c95e42ad0b7d120950ea59d4365be2305d8c
Depends-on: I8cef6c98f9242cc38d66de0ac499490e2a237887

jenkins/jobs/cinder.yaml

@@ -72,37 +72,3 @@
       - test-results
       - devstack-logs
       - console-log
-
-- job-template:
-    name: '{pipeline}-cinder-dsvm-apache-{node}{suffix}'
-    node: '{node}'
-
-    wrappers:
-      - build-timeout:
-          timeout: 130
-      - timestamps
-
-    builders:
-      - link-logs
-      - net-info
-      - devstack-checkout
-      - local_conf:
-          conf: |
-            [[local|localrc]]
-            CINDER_USE_MOD_WSGI=True
-      - shell: |
-          #!/bin/bash -xe
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TEMPEST=1
-          export DEVSTACK_GATE_TEMPEST_FULL=1
-          export BRANCH_OVERRIDE={branch-override}
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          fi
-          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

@@ -1256,11 +1256,6 @@
           suffix: '-nv'
       - gate-rally-dsvm-py35-{name}{suffix}:
           suffix: '-nv'
-      - '{pipeline}-cinder-dsvm-apache-{node}{suffix}':
-          pipeline: gate
-          node: ubuntu-xenial
-          suffix: '-nv'
-          branch-override: default
       - '{pipeline}-tempest-dsvm-multibackend-matrix-{node}{suffix}':
           pipeline: gate
           node: ubuntu-xenial

zuul/layout.yaml

@@ -2516,9 +2516,6 @@ jobs:
   - name: ^gate-cinder-tox-compliance-ubuntu-xenial$
     branch: ^(?!driverfixes/).*$
 
-  - name: ^gate-cinder-dsvm-apache-ubuntu-xenial.*$
-    branch: ^(?!driverfixes/).*$
-
   - name: ^gate-cinder-tox-bandit-baseline-ubuntu-xenial$
     branch: ^(?!(stable/(newton|ocata)|driverfixes/)).*$
     voting: false
@@ -6526,7 +6523,6 @@ projects:
       - gate-cinder-pylint-ubuntu-xenial
       - gate-rally-dsvm-cinder-ubuntu-xenial-nv
       - gate-tempest-dsvm-full-devstack-plugin-ceph-ubuntu-xenial
-      - gate-cinder-dsvm-apache-ubuntu-xenial-nv
       - gate-cinder-tox-functional-ubuntu-xenial
       - gate-cinder-tox-compliance-ubuntu-xenial
       - gate-cinder-tox-bandit-baseline-ubuntu-xenial