Native Zuul v3 cinder-grenade jobs

Specialize the grenade-multinode job and test the variations
on upgrade where a few services are available on the subnode only
(c-bak only, c-bak+c-vol, c-bak+c-sch+c-vol).

Also, use grenade instead of grenade-py3. The former is now used
(after Iea355514ec7cc2a52ed5e88c356bcb1cdeadd639) in
integrated-gate-storage instead of the latter, which means
that we need to change it in order to apply the value of
irrelevant-files.

Depends-On: https://review.opendev.org/548936
Change-Id: I3eac1afcbb69e25e9b2a916910caf3291aa7c1fe

6 files changed, 0 insertions, 205 deletions

diff --git a/playbooks/legacy/grenade-dsvm-cinder-mn-sub-bak/post.yaml b/playbooks/legacy/grenade-dsvm-cinder-mn-sub-bak/post.yaml
deleted file mode 100644
index e07f5510a..000000000
--- a/playbooks/legacy/grenade-dsvm-cinder-mn-sub-bak/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/grenade-dsvm-cinder-mn-sub-bak/run.yaml b/playbooks/legacy/grenade-dsvm-cinder-mn-sub-bak/run.yaml
deleted file mode 100644
index f8ba33b1b..000000000
--- a/playbooks/legacy/grenade-dsvm-cinder-mn-sub-bak/run.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-- hosts: primary
-  name: Autoconverted job legacy-grenade-dsvm-cinder-mn-sub-bak from old job gate-grenade-dsvm-cinder-mn-sub-bak-ubuntu-xenial-nv
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cat > clonemap.yaml << EOF
-          clonemap:
-            - name: openstack/devstack-gate
-              dest: devstack-gate
-          EOF
-          /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              https://opendev.org \
-              openstack/devstack-gate
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_CONFIGDRIVE=0
-          export DEVSTACK_GATE_GRENADE=pullup
-          export DEVSTACK_GATE_USE_PYTHON3=True
-          export PROJECTS="openstack/grenade $PROJECTS"
-          export BRANCH_OVERRIDE=default
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          fi
-          export DEVSTACK_GATE_TOPOLOGY="multinode"
-          export SERVICES=bak
-          if [ "$SERVICES" == "bak" ] ; then
-            export DEVSTACK_GATE_CINDER_MN_GRENADE_SUB_BAK=1
-          elif [ "$SERVICES" == "volschbak" ] ; then
-            export DEVSTACK_GATE_CINDER_MN_GRENADE_SUB_VOLSCHBAK=1
-          else
-            export DEVSTACK_GATE_CINDER_MN_GRENADE=1
-          fi
-
-          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 }}'
diff --git a/playbooks/legacy/grenade-dsvm-cinder-mn-sub-volbak/post.yaml b/playbooks/legacy/grenade-dsvm-cinder-mn-sub-volbak/post.yaml
deleted file mode 100644
index e07f5510a..000000000
--- a/playbooks/legacy/grenade-dsvm-cinder-mn-sub-volbak/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/grenade-dsvm-cinder-mn-sub-volbak/run.yaml b/playbooks/legacy/grenade-dsvm-cinder-mn-sub-volbak/run.yaml
deleted file mode 100644
index b06abba60..000000000
--- a/playbooks/legacy/grenade-dsvm-cinder-mn-sub-volbak/run.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-- hosts: primary
-  name: Autoconverted job legacy-grenade-dsvm-cinder-mn-sub-volbak from old job gate-grenade-dsvm-cinder-mn-sub-volbak-ubuntu-xenial
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cat > clonemap.yaml << EOF
-          clonemap:
-            - name: openstack/devstack-gate
-              dest: devstack-gate
-          EOF
-          /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              https://opendev.org \
-              openstack/devstack-gate
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_CONFIGDRIVE=0
-          export DEVSTACK_GATE_GRENADE=pullup
-          export DEVSTACK_GATE_USE_PYTHON3=True
-          export PROJECTS="openstack/grenade $PROJECTS"
-          export BRANCH_OVERRIDE=default
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          fi
-          export DEVSTACK_GATE_TOPOLOGY="multinode"
-          export SERVICES=volbak
-          if [ "$SERVICES" == "bak" ] ; then
-            export DEVSTACK_GATE_CINDER_MN_GRENADE_SUB_BAK=1
-          elif [ "$SERVICES" == "volschbak" ] ; then
-            export DEVSTACK_GATE_CINDER_MN_GRENADE_SUB_VOLSCHBAK=1
-          else
-            export DEVSTACK_GATE_CINDER_MN_GRENADE=1
-          fi
-
-          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 }}'
diff --git a/playbooks/legacy/grenade-dsvm-cinder-mn-sub-volschbak/post.yaml b/playbooks/legacy/grenade-dsvm-cinder-mn-sub-volschbak/post.yaml
deleted file mode 100644
index e07f5510a..000000000
--- a/playbooks/legacy/grenade-dsvm-cinder-mn-sub-volschbak/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/grenade-dsvm-cinder-mn-sub-volschbak/run.yaml b/playbooks/legacy/grenade-dsvm-cinder-mn-sub-volschbak/run.yaml
deleted file mode 100644
index 476fef85f..000000000
--- a/playbooks/legacy/grenade-dsvm-cinder-mn-sub-volschbak/run.yaml
+++ /dev/null
@@ -1,54 +0,0 @@
-- hosts: primary
-  name: Autoconverted job legacy-grenade-dsvm-cinder-mn-sub-volschbak from old job
-    gate-grenade-dsvm-cinder-mn-sub-volschbak-ubuntu-xenial-nv
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cat > clonemap.yaml << EOF
-          clonemap:
-            - name: openstack/devstack-gate
-              dest: devstack-gate
-          EOF
-          /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              https://opendev.org \
-              openstack/devstack-gate
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_CONFIGDRIVE=0
-          export DEVSTACK_GATE_GRENADE=pullup
-          export DEVSTACK_GATE_USE_PYTHON3=True
-          export PROJECTS="openstack/grenade $PROJECTS"
-          export BRANCH_OVERRIDE=default
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          fi
-          export DEVSTACK_GATE_TOPOLOGY="multinode"
-          export SERVICES=volschbak
-          if [ "$SERVICES" == "bak" ] ; then
-            export DEVSTACK_GATE_CINDER_MN_GRENADE_SUB_BAK=1
-          elif [ "$SERVICES" == "volschbak" ] ; then
-            export DEVSTACK_GATE_CINDER_MN_GRENADE_SUB_VOLSCHBAK=1
-          else
-            export DEVSTACK_GATE_CINDER_MN_GRENADE=1
-          fi
-
-          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 }}'