From ca4e029f2a5b105bf479dc75b1f3f2d61595f5c0 Mon Sep 17 00:00:00 2001
From: Luigi Toscano <ltoscano@redhat.com>
Date: Tue, 1 Sep 2020 12:08:46 +0200
Subject: [PATCH] Remove the definition of trove-grenade

(and of its now unused parent trove-legacy-dsvm-base)

The job is not used in this repository anymore (since
I49bd6c824b837d22d9f3945a3e8c2343c831b352).
It was only used by grenade.git, but that usage has been removed
by I8f976041e98502de4770ece8cb7f04a928e8f3d9.

Moreover, it is a legacy job and it should be ported to a native
Zuul v3 job, and more important it doesn't really test the upgrade,
because there are no grenade plugins for trove.

An upgrade job is useful, but a grenade trove plugin should be written
first and a new native job should be created instead of restoring
the legacy one.

Depends-On: https://review.opendev.org/749212
Change-Id: Ib5ecc496aee28a6a2bbb01138e1f511bfc179302
---
 .zuul.yaml                                    | 31 ------------
 playbooks/legacy/grenade-dsvm-trove/post.yaml | 15 ------
 playbooks/legacy/grenade-dsvm-trove/run.yaml  | 47 -------------------
 3 files changed, 93 deletions(-)
 delete mode 100644 playbooks/legacy/grenade-dsvm-trove/post.yaml
 delete mode 100644 playbooks/legacy/grenade-dsvm-trove/run.yaml

diff --git a/.zuul.yaml b/.zuul.yaml
index 6364df5624..9a31764296 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -38,26 +38,6 @@
             branches:
               - master
 
-- job:
-    name: trove-legacy-dsvm-base
-    parent: legacy-dsvm-base
-    abstract: true
-    timeout: 10800
-    required-projects:
-      - openstack/devstack-gate
-      - openstack/diskimage-builder
-      - openstack/tripleo-image-elements
-      - openstack/trove
-      - openstack/trove-dashboard
-    irrelevant-files:
-      - ^.*\.rst$
-      - ^api-ref/.*$
-      - ^doc/.*$
-      - ^releasenotes/.*$
-      - ^tools/.*$
-      - ^trove/hacking/.*$
-      - ^trove/tests/unittests/.*$
-
 - job:
     name: trove-devstack-base
     parent: devstack
@@ -138,17 +118,6 @@
       trove_test_group: 'mysql'
       trove_test_datastore_version: '5.7.29'
 
-- job:
-    name: trove-grenade
-    parent: trove-legacy-dsvm-base
-    run: playbooks/legacy/grenade-dsvm-trove/run.yaml
-    post-run: playbooks/legacy/grenade-dsvm-trove/post.yaml
-    required-projects:
-      - openstack/grenade
-      - openstack/devstack-gate
-      - openstack/trove
-      - openstack/trove-dashboard
-
 - job:
     name: trove-scenario-cassandra-single
     parent: trove-devstack-base
diff --git a/playbooks/legacy/grenade-dsvm-trove/post.yaml b/playbooks/legacy/grenade-dsvm-trove/post.yaml
deleted file mode 100644
index e07f5510ae..0000000000
--- a/playbooks/legacy/grenade-dsvm-trove/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-trove/run.yaml b/playbooks/legacy/grenade-dsvm-trove/run.yaml
deleted file mode 100644
index 1cf2a67e75..0000000000
--- a/playbooks/legacy/grenade-dsvm-trove/run.yaml
+++ /dev/null
@@ -1,47 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-grenade-dsvm-trove from old job gate-grenade-dsvm-trove
-  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 PROJECTS="openstack/grenade $PROJECTS"
-          export PROJECTS="openstack/trove-dashboard $PROJECTS"
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TEMPEST=1
-          export DEVSTACK_GATE_TEMPEST_FULL=1
-          export DEVSTACK_GATE_GRENADE=pullup
-          export DEVSTACK_GATE_TROVE=1
-          export TEMPEST_CONCURRENCY=2
-          export BRANCH_OVERRIDE=default
-          export DEVSTACK_GATE_USE_PYTHON3=True
-          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
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'