From 3b6ea369044f4bade319bdf3334d5b855e0b74ba Mon Sep 17 00:00:00 2001
From: Goutham Pacha Ravi <gouthampravi@gmail.com>
Date: Fri, 21 May 2021 10:18:31 -0700
Subject: [PATCH] [devstack] Drop manila-tempest-plugin installation

This method of installing manila-tempest-plugin
was deprecated several releases ago, but compatibility
was maintained for third party CI jobs. Since sufficient
time has passed allowing third party CI to adopt,
lets drop this from the devstack plugin

Change-Id: I59ffe6ebe4b2e80be1e6ae97872cf4db6527da62
Signed-off-by: Goutham Pacha Ravi <gouthampravi@gmail.com>
---
 contrib/ci/pre_test_hook.sh |  2 --
 devstack/plugin.sh          | 20 --------------------
 zuul.d/grenade-jobs.yaml    |  1 -
 3 files changed, 23 deletions(-)

diff --git a/contrib/ci/pre_test_hook.sh b/contrib/ci/pre_test_hook.sh
index c3ca0bac38..aa5f9e60c8 100755
--- a/contrib/ci/pre_test_hook.sh
+++ b/contrib/ci/pre_test_hook.sh
@@ -44,8 +44,6 @@ echo "IDENTITY_API_VERSION=3" >> $localconf
 echo "CINDER_OVERSUBSCRIPTION_RATIO=100.0" >> $localconf
 echo "MANILA_ENABLED_BACKENDS=london,paris" >> $localconf
 
-echo "MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=${MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE:=True}" >> $localconf
-
 echo "MANILA_ALLOW_NAS_SERVER_PORTS_ON_HOST=${MANILA_ALLOW_NAS_SERVER_PORTS_ON_HOST:=False}" >> $localconf
 
 # === Handle script arguments ===
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 0576f6fefe..ed3e1ecced 100755
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -914,15 +914,6 @@ function stop_manila {
     done
 }
 
-function install_manila_tempest_plugin {
-    MANILA_TEMPEST_PLUGIN_REPO=${MANILA_TEMPEST_PLUGIN_REPO:-${GIT_BASE}/openstack/manila-tempest-plugin}
-    MANILA_TEMPEST_PLUGIN_BRANCH=${MANILA_TEMPEST_PLUGIN_BRANCH:-master}
-    MANILA_TEMPEST_PLUGIN_DIR=$DEST/manila-tempest-plugin
-
-    git_clone $MANILA_TEMPEST_PLUGIN_REPO $MANILA_TEMPEST_PLUGIN_DIR $MANILA_TEMPEST_PLUGIN_BRANCH
-    setup_develop $MANILA_TEMPEST_PLUGIN_DIR
-}
-
 # update_tempest - Function used for updating Tempest config if Tempest service enabled
 function update_tempest {
     if is_service_enabled tempest; then
@@ -1302,17 +1293,6 @@ elif [[ "$1" == "stack" && "$2" == "test-config" ]]; then
     fi
     ###########################################################################
 
-
-    if [ $(trueorfalse False MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE) == True ]; then
-        echo_summary "Fetching and installing manila-tempest-plugin system-wide"
-        install_manila_tempest_plugin
-        export DEPRECATED_TEXT="$DEPRECATED_TEXT\nInstalling
-        manila-tempest-plugin can be done with the help of its own DevStack
-        plugin by adding: \n\n\t'enable_plugin manila-tempest-plugin
-        https://opendev.org/openstack/manila-tempest-plugin'.\n\nManila's
-        DevStack plugin will stop installing it automatically."
-    fi
-
     echo_summary "Update Tempest config"
     update_tempest
 
diff --git a/zuul.d/grenade-jobs.yaml b/zuul.d/grenade-jobs.yaml
index 90e69f0b86..ad14826cdf 100644
--- a/zuul.d/grenade-jobs.yaml
+++ b/zuul.d/grenade-jobs.yaml
@@ -23,7 +23,6 @@
           # This job performs data path tests, it's good to test
           # both DHSS driver modes with it, but for now, it'll use the LVM
           # driver (DHSS=False)
-          MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE: false
           MANILA_ALLOW_NAS_SERVER_PORTS_ON_HOST: true
           MANILA_DEFAULT_SHARE_TYPE_EXTRA_SPECS: 'snapshot_support=True create_share_from_snapshot_support=True revert_to_snapshot_support=True mount_snapshot_support=True'
           MANILA_CONFIGURE_DEFAULT_TYPES: true