Drop nova-multiattach job

The dependent tempest change enables the volume multiattach
tests in the tempest-full and tempest-slow jobs, on which
nova already gates, which allows us to drop the special
nova-multiattach job which is mostly redundant test coverage
of the other tempest.api.compute.* tests, and allows us to
run one fewer job on nova/cinder/tempest changes in Stein.

The docs are updated to reflect the source of the testing
now.

Also depends on cinder dropping its usage of the nova-multiattach
job before we can drop the job definition from nova.

Depends-On: https://review.openstack.org/606978
Depends-On: https://review.openstack.org/606985
Change-Id: I744afa1df9a6ed8e0eba4310b20c33755ce1ba88

4 files changed, 2 insertions, 89 deletions

diff --git a/.zuul.yaml b/.zuul.yaml
index 2f11a75db5..032295a048 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -152,17 +152,6 @@
     voting: false
 
 - job:
-    name: nova-multiattach
-    parent: nova-dsvm-base
-    description: |
-      Run tempest integration tests with volume multiattach support enabled.
-      This job will only work starting with Queens.
-      It uses the default Cinder volume type in devstack (lvm) and the
-      default compute driver in devstack (libvirt).
-    run: playbooks/legacy/nova-multiattach/run.yaml
-    post-run: playbooks/legacy/nova-multiattach/post.yaml
-
-- job:
     name: nova-next
     parent: nova-dsvm-base
     description: |
@@ -241,7 +230,6 @@
               - ^(?!nova/network/.*)(?!nova/virt/libvirt/vif.py).*$
         - nova-live-migration
         - nova-lvm
-        - nova-multiattach
         - nova-next
         - nova-tox-functional
         - nova-tox-functional-py35
@@ -261,7 +249,6 @@
         - neutron-grenade:
             irrelevant-files: *dsvm-irrelevant-files
         - nova-live-migration
-        - nova-multiattach
         - nova-tox-functional
         - nova-tox-functional-py35
         - nova-next
diff --git a/doc/source/admin/manage-volumes.rst b/doc/source/admin/manage-volumes.rst
index 1ac2a7a499..f383ea911a 100644
--- a/doc/source/admin/manage-volumes.rst
+++ b/doc/source/admin/manage-volumes.rst
@@ -65,15 +65,9 @@ Testing
 ~~~~~~~
 
 Continuous integration testing of the volume multiattach feature is done
-via the ``nova-multiattach`` job, defined in the `nova repository`_.
-
-The tests are defined in the `tempest repository`_.
-
-The CI job is setup to run with the **libvirt** compute driver and the **lvm**
-volume back end. It purposefully does not use the Pike Ubuntu Cloud Archive
-package mirror so that it gets qemu<2.10.
+via the ``tempest-full`` and ``tempest-slow`` jobs, which, along with the
+tests themselves, are defined in the `tempest repository`_.
 
 .. _added support for multiattach volumes: https://specs.openstack.org/openstack/nova-specs/specs/queens/implemented/multi-attach-volume.html
 .. _recorded overview and demo: https://www.youtube.com/watch?v=hZg6wqxdEHk
-.. _nova repository: http://git.openstack.org/cgit/openstack/nova/tree/playbooks/legacy/nova-multiattach/run.yaml
 .. _tempest repository: http://codesearch.openstack.org/?q=CONF.compute_feature_enabled.volume_multiattach&i=nope&files=&repos=tempest
diff --git a/playbooks/legacy/nova-multiattach/post.yaml b/playbooks/legacy/nova-multiattach/post.yaml
deleted file mode 100644
index e07f5510ae..0000000000
--- a/playbooks/legacy/nova-multiattach/post.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-- hosts: primary
-  tasks:
-
-    - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
-      synchronize:
-        src: '{{ ansible_user_dir }}/workspace/'
-        dest: '{{ zuul.executor.log_root }}'
-        mode: pull
-        copy_links: true
-        verify_host: true
-        rsync_opts:
-          - --include=/logs/**
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
diff --git a/playbooks/legacy/nova-multiattach/run.yaml b/playbooks/legacy/nova-multiattach/run.yaml
deleted file mode 100644
index 4ba92417a4..0000000000
--- a/playbooks/legacy/nova-multiattach/run.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-- hosts: all
-  name: nova-multiattach
-  tasks:
-
-    - name: Ensure workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cat > clonemap.yaml << EOF
-          clonemap:
-            - name: openstack-infra/devstack-gate
-              dest: devstack-gate
-          EOF
-          /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              git://git.openstack.org \
-              openstack-infra/devstack-gate
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cat << 'EOF' >>"/tmp/dg-local.conf"
-          [[local|localrc]]
-          ENABLE_VOLUME_MULTIATTACH=True
-
-          EOF
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          export PYTHONUNBUFFERED=true
-          # Yes we want to run Tempest.
-          export DEVSTACK_GATE_TEMPEST=1
-          # Only run compute API tests; note that this will need to
-          # be updated if multiattach scenario tests are ever added.
-          export DEVSTACK_GATE_TEMPEST_REGEX="api.compute"
-          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
-          ./safe-devstack-vm-gate-wrap.sh
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'