Make manila-tempest-plugin installation optional
manila-tempest-plugin can be installed with its
devstack plugin; Installing it via manila's plugin
is unnecessary. So, deprecate its installation
in the DevStack plugin.
This change is being backported to the stable branches
to allow Zuulv3 style jobs to eventually be supported
on these branches. Without this change, installation
of manila will fail on Zuulv3 jobs with the error:
'The /opt/stack/manila-tempest-plugin project was not found;
if this is a gate job, add the project to the $PROJECTS variable
in the job definition.'
die 563 'Cloning not allowed in this configuration'
If manila-tempest-plugin is added to $PROJECTS as suggested,
we'll end up double cloning this project, once via its
devstack plugin and once in manila's own devstack plugin.
Change-Id: I21c08069ff82b3bfb52ef7ac960183ddc866c2ee
(cherry picked from commit 8d03a2a46e
)
Signed-off-by: Goutham Pacha Ravi <gouthampravi@gmail.com>
This commit is contained in:
parent
0f27c9e4da
commit
d39d930274
|
@ -45,6 +45,8 @@ echo "MANILA_BACKEND2_CONFIG_GROUP_NAME=paris" >> $localconf
|
|||
echo "MANILA_SHARE_BACKEND1_NAME=LONDON" >> $localconf
|
||||
echo "MANILA_SHARE_BACKEND2_NAME=PARIS" >> $localconf
|
||||
|
||||
echo "MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=${MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE:=True}" >> $localconf
|
||||
|
||||
# === Handle script arguments ===
|
||||
# First argument is expected to be a boolean-like value for DHSS.
|
||||
DHSS=$1
|
||||
|
|
|
@ -1237,8 +1237,17 @@ elif [[ "$1" == "stack" && "$2" == "test-config" ]]; then
|
|||
fi
|
||||
###########################################################################
|
||||
|
||||
echo_summary "Fetching and installing manila-tempest-plugin system-wide"
|
||||
install_manila_tempest_plugin
|
||||
|
||||
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
|
||||
fi
|
||||
|
|
|
@ -211,6 +211,11 @@ MANILA_DATA_COPY_CHECK_HASH=${MANILA_DATA_COPY_CHECK_HASH:=True}
|
|||
# Manila IPv6 Setup flag
|
||||
MANILA_SETUP_IPV6=${MANILA_SETUP_IPV6:=False}
|
||||
|
||||
# Install manila-tempest-plugin system-wide
|
||||
# This operation has been deprecated. manila-tempest-plugin has a devstack
|
||||
# plugin that must be preferred over this approach.
|
||||
MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=${MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE:=True}
|
||||
|
||||
# Enable manila services
|
||||
# ----------------------
|
||||
# We have to add Manila to enabled services for screen_it to work
|
||||
|
|
|
@ -35,6 +35,8 @@
|
|||
export DEVSTACK_GATE_TEMPEST_NOTESTS=1
|
||||
export DEVSTACK_GATE_GRENADE=pullup
|
||||
|
||||
export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False
|
||||
|
||||
# Basic services needed for grenade manila job using dummy driver
|
||||
export OVERRIDE_ENABLED_SERVICES=key,mysql,rabbit
|
||||
|
||||
|
|
|
@ -31,6 +31,7 @@
|
|||
cat << 'EOF' >>"/tmp/dg-local.conf"
|
||||
[[local|localrc]]
|
||||
enable_plugin manila https://opendev.org/openstack/manila
|
||||
enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin
|
||||
|
||||
EOF
|
||||
executable: /bin/bash
|
||||
|
@ -50,6 +51,7 @@
|
|||
export PROJECTS="openstack/manila-image-elements $PROJECTS"
|
||||
|
||||
export ENABLED_SERVICES=tempest
|
||||
export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False
|
||||
|
||||
# Keep localrc to be able to set some vars in pre_test_hook
|
||||
export KEEP_LOCALRC=1
|
||||
|
|
|
@ -30,6 +30,7 @@
|
|||
cat << 'EOF' >>"/tmp/dg-local.conf"
|
||||
[[local|localrc]]
|
||||
enable_plugin manila https://opendev.org/openstack/manila
|
||||
enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin
|
||||
|
||||
EOF
|
||||
executable: /bin/bash
|
||||
|
@ -51,6 +52,8 @@
|
|||
export KEEP_LOCALRC=1
|
||||
export PROJECTS="openstack/manila-tempest-plugin $PROJECTS"
|
||||
|
||||
export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False
|
||||
|
||||
function pre_test_hook {
|
||||
# 'dhss' - acronym for 'Driver Handles Share Servers',
|
||||
# defines mode of a share driver. Boolean-like.
|
||||
|
|
|
@ -31,6 +31,7 @@
|
|||
cat << 'EOF' >>"/tmp/dg-local.conf"
|
||||
[[local|localrc]]
|
||||
enable_plugin manila https://opendev.org/openstack/manila
|
||||
enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin
|
||||
|
||||
EOF
|
||||
executable: /bin/bash
|
||||
|
@ -50,6 +51,7 @@
|
|||
export PROJECTS="openstack/manila-image-elements $PROJECTS"
|
||||
|
||||
export ENABLED_SERVICES=tempest
|
||||
export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False
|
||||
|
||||
# Keep localrc to be able to set some vars in pre_test_hook
|
||||
export KEEP_LOCALRC=1
|
||||
|
|
|
@ -30,6 +30,8 @@
|
|||
cat << 'EOF' >>"/tmp/dg-local.conf"
|
||||
[[local|localrc]]
|
||||
enable_plugin manila https://opendev.org/openstack/manila
|
||||
enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin
|
||||
|
||||
# Enable devstack-plugin-glusterfs plugin, to install and configure GlusterFS.
|
||||
enable_plugin devstack-plugin-glusterfs https://opendev.org/x/devstack-plugin-glusterfs
|
||||
|
||||
|
@ -57,6 +59,7 @@
|
|||
# Keep localrc to be able to set some vars in pre_test_hook
|
||||
export KEEP_LOCALRC=1
|
||||
export PROJECTS="openstack/manila-tempest-plugin $PROJECTS"
|
||||
export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False
|
||||
|
||||
function pre_test_hook {
|
||||
# Configure devstack to run manila installation without handling of share servers
|
||||
|
|
|
@ -30,6 +30,8 @@
|
|||
cat << 'EOF' >>"/tmp/dg-local.conf"
|
||||
[[local|localrc]]
|
||||
enable_plugin manila https://opendev.org/openstack/manila
|
||||
enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin
|
||||
|
||||
# Enable devstack-plugin-glusterfs plugin, to install and configure GlusterFS.
|
||||
enable_plugin devstack-plugin-glusterfs https://opendev.org/x/devstack-plugin-glusterfs
|
||||
|
||||
|
@ -57,6 +59,7 @@
|
|||
# Keep localrc to be able to set some vars in pre_test_hook
|
||||
export KEEP_LOCALRC=1
|
||||
export PROJECTS="openstack/manila-tempest-plugin $PROJECTS"
|
||||
export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False
|
||||
|
||||
function pre_test_hook {
|
||||
# Configure devstack to run manila installation without handling of share servers
|
||||
|
|
|
@ -31,6 +31,8 @@
|
|||
cat << 'EOF' >>"/tmp/dg-local.conf"
|
||||
[[local|localrc]]
|
||||
enable_plugin manila https://opendev.org/openstack/manila
|
||||
enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin
|
||||
|
||||
# Enable devstack-plugin-glusterfs plugin, to install and configure GlusterFS.
|
||||
enable_plugin devstack-plugin-glusterfs https://opendev.org/x/devstack-plugin-glusterfs
|
||||
|
||||
|
@ -58,6 +60,7 @@
|
|||
# Keep localrc to be able to set some vars in pre_test_hook
|
||||
export KEEP_LOCALRC=1
|
||||
export PROJECTS="openstack/manila-tempest-plugin $PROJECTS"
|
||||
export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False
|
||||
|
||||
function pre_test_hook {
|
||||
# Configure devstack to run manila installation without handling of share servers
|
||||
|
|
|
@ -30,6 +30,8 @@
|
|||
cat << 'EOF' >>"/tmp/dg-local.conf"
|
||||
[[local|localrc]]
|
||||
enable_plugin manila https://opendev.org/openstack/manila
|
||||
enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin
|
||||
|
||||
# Enable devstack-plugin-glusterfs plugin, to install and configure GlusterFS.
|
||||
enable_plugin devstack-plugin-glusterfs https://opendev.org/x/devstack-plugin-glusterfs
|
||||
|
||||
|
@ -57,6 +59,7 @@
|
|||
|
||||
# Keep localrc to be able to set some vars in pre_test_hook
|
||||
export KEEP_LOCALRC=1
|
||||
export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False
|
||||
|
||||
function pre_test_hook {
|
||||
# Configure devstack to run manila installation without handling of share servers
|
||||
|
|
|
@ -30,6 +30,8 @@
|
|||
cat << 'EOF' >>"/tmp/dg-local.conf"
|
||||
[[local|localrc]]
|
||||
enable_plugin manila https://opendev.org/openstack/manila
|
||||
enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin
|
||||
|
||||
# Enable devstack-plugin-hdfs plugin, to install and configure HDFS.
|
||||
enable_plugin devstack-plugin-hdfs https://opendev.org/x/devstack-plugin-hdfs
|
||||
|
||||
|
@ -51,6 +53,7 @@
|
|||
# Keep localrc to be able to set some vars in pre_test_hook
|
||||
export KEEP_LOCALRC=1
|
||||
export PROJECTS="openstack/manila-tempest-plugin $PROJECTS"
|
||||
export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False
|
||||
|
||||
function pre_test_hook {
|
||||
# Configure devstack to run manila installation without handling of share servers
|
||||
|
|
|
@ -30,6 +30,7 @@
|
|||
cat << 'EOF' >>"/tmp/dg-local.conf"
|
||||
[[local|localrc]]
|
||||
enable_plugin manila https://opendev.org/openstack/manila
|
||||
enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin
|
||||
|
||||
EOF
|
||||
executable: /bin/bash
|
||||
|
@ -50,6 +51,7 @@
|
|||
# Keep localrc to be able to set some vars in pre_test_hook
|
||||
export KEEP_LOCALRC=1
|
||||
export PROJECTS="openstack/manila-tempest-plugin $PROJECTS"
|
||||
export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False
|
||||
|
||||
function pre_test_hook {
|
||||
# 'dhss' - acronym for 'Driver Handles Share Servers',
|
||||
|
|
|
@ -30,6 +30,7 @@
|
|||
cat << 'EOF' >>"/tmp/dg-local.conf"
|
||||
[[local|localrc]]
|
||||
enable_plugin manila https://opendev.org/openstack/manila
|
||||
enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin
|
||||
|
||||
EOF
|
||||
executable: /bin/bash
|
||||
|
@ -50,6 +51,7 @@
|
|||
# Keep localrc to be able to set some vars in pre_test_hook
|
||||
export KEEP_LOCALRC=1
|
||||
export PROJECTS="openstack/manila-tempest-plugin $PROJECTS"
|
||||
export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False
|
||||
|
||||
function pre_test_hook {
|
||||
# 'dhss' - acronym for 'Driver Handles Share Servers',
|
||||
|
|
|
@ -30,6 +30,7 @@
|
|||
cat << 'EOF' >>"/tmp/dg-local.conf"
|
||||
[[local|localrc]]
|
||||
enable_plugin manila https://opendev.org/openstack/manila
|
||||
enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin
|
||||
|
||||
EOF
|
||||
executable: /bin/bash
|
||||
|
@ -50,6 +51,7 @@
|
|||
# Keep localrc to be able to set some vars in pre_test_hook
|
||||
export KEEP_LOCALRC=1
|
||||
export PROJECTS="openstack/manila-tempest-plugin $PROJECTS"
|
||||
export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False
|
||||
|
||||
function pre_test_hook {
|
||||
# 'dhss' - acronym for 'Driver Handles Share Servers',
|
||||
|
|
|
@ -30,6 +30,7 @@
|
|||
cat << 'EOF' >>"/tmp/dg-local.conf"
|
||||
[[local|localrc]]
|
||||
enable_plugin manila https://opendev.org/openstack/manila
|
||||
enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin
|
||||
|
||||
EOF
|
||||
executable: /bin/bash
|
||||
|
@ -50,6 +51,7 @@
|
|||
# Keep localrc to be able to set some vars in pre_test_hook
|
||||
export KEEP_LOCALRC=1
|
||||
export PROJECTS="openstack/manila-tempest-plugin $PROJECTS"
|
||||
export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False
|
||||
|
||||
function pre_test_hook {
|
||||
# 'dhss' - acronym for 'Driver Handles Share Servers',
|
||||
|
|
|
@ -30,6 +30,7 @@
|
|||
cat << 'EOF' >>"/tmp/dg-local.conf"
|
||||
[[local|localrc]]
|
||||
enable_plugin manila https://opendev.org/openstack/manila
|
||||
enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin
|
||||
|
||||
EOF
|
||||
executable: /bin/bash
|
||||
|
@ -50,6 +51,7 @@
|
|||
# Keep localrc to be able to set some vars in pre_test_hook
|
||||
export KEEP_LOCALRC=1
|
||||
export PROJECTS="openstack/manila-tempest-plugin $PROJECTS"
|
||||
export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False
|
||||
|
||||
function pre_test_hook {
|
||||
# 'dhss' - acronym for 'Driver Handles Share Servers',
|
||||
|
|
|
@ -64,7 +64,7 @@
|
|||
[[local|localrc]]
|
||||
SKIP_EPEL_INSTALL=True
|
||||
enable_plugin manila https://opendev.org/openstack/manila
|
||||
|
||||
enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin
|
||||
enable_plugin devstack-plugin-ceph https://opendev.org/openstack/devstack-plugin-ceph
|
||||
|
||||
# Enable CephFS as the backend for Manila.
|
||||
|
@ -101,6 +101,7 @@
|
|||
export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient"
|
||||
export KEEP_LOCALRC=1
|
||||
export PROJECTS="openstack/manila-tempest-plugin $PROJECTS"
|
||||
export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False
|
||||
OVERRIDE_ENABLED_SERVICES=key,mysql,rabbit,tempest
|
||||
export OVERRIDE_ENABLED_SERVICES
|
||||
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
cat << 'EOF' >>"/tmp/dg-local.conf"
|
||||
[[local|localrc]]
|
||||
enable_plugin manila https://opendev.org/openstack/manila
|
||||
|
||||
enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin
|
||||
enable_plugin devstack-plugin-ceph https://opendev.org/openstack/devstack-plugin-ceph
|
||||
|
||||
# Enable CephFS as the backend for Manila.
|
||||
|
@ -70,6 +70,7 @@
|
|||
OVERRIDE_ENABLED_SERVICES=key,mysql,rabbit,tempest
|
||||
export OVERRIDE_ENABLED_SERVICES
|
||||
|
||||
export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False
|
||||
export DEVSTACK_GATE_USE_PYTHON3=True
|
||||
|
||||
function pre_test_hook {
|
||||
|
|
|
@ -64,7 +64,7 @@
|
|||
[[local|localrc]]
|
||||
SKIP_EPEL_INSTALL=True
|
||||
enable_plugin manila https://opendev.org/openstack/manila
|
||||
|
||||
enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin
|
||||
enable_plugin devstack-plugin-ceph https://opendev.org/openstack/devstack-plugin-ceph
|
||||
|
||||
# Enable CephFS as the backend for Manila.
|
||||
|
@ -101,6 +101,7 @@
|
|||
export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient"
|
||||
export KEEP_LOCALRC=1
|
||||
export PROJECTS="openstack/manila-tempest-plugin $PROJECTS"
|
||||
export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False
|
||||
OVERRIDE_ENABLED_SERVICES=key,mysql,rabbit,tempest
|
||||
export OVERRIDE_ENABLED_SERVICES
|
||||
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
cat << 'EOF' >>"/tmp/dg-local.conf"
|
||||
[[local|localrc]]
|
||||
enable_plugin manila https://opendev.org/openstack/manila
|
||||
|
||||
enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin
|
||||
enable_plugin devstack-plugin-ceph https://opendev.org/openstack/devstack-plugin-ceph
|
||||
|
||||
# Enable CephFS as the backend for Manila.
|
||||
|
@ -65,6 +65,8 @@
|
|||
export ENABLED_SERVICES=tempest
|
||||
export PROJECTS="openstack/devstack-plugin-ceph $PROJECTS"
|
||||
export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient"
|
||||
export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False
|
||||
|
||||
export KEEP_LOCALRC=1
|
||||
export PROJECTS="openstack/manila-tempest-plugin $PROJECTS"
|
||||
OVERRIDE_ENABLED_SERVICES=key,mysql,rabbit,tempest
|
||||
|
|
|
@ -30,6 +30,7 @@
|
|||
cat << 'EOF' >>"/tmp/dg-local.conf"
|
||||
[[local|localrc]]
|
||||
enable_plugin manila https://opendev.org/openstack/manila
|
||||
enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin
|
||||
|
||||
EOF
|
||||
executable: /bin/bash
|
||||
|
@ -52,6 +53,7 @@
|
|||
# Keep localrc to be able to set some vars in pre_test_hook
|
||||
export KEEP_LOCALRC=1
|
||||
export PROJECTS="openstack/manila-tempest-plugin $PROJECTS"
|
||||
export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False
|
||||
|
||||
function pre_test_hook {
|
||||
# 'dhss' - acronym for 'Driver Handles Share Servers',
|
||||
|
|
|
@ -31,6 +31,7 @@
|
|||
[[local|localrc]]
|
||||
SKIP_EPEL_INSTALL=True
|
||||
enable_plugin manila https://opendev.org/openstack/manila
|
||||
enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin
|
||||
enable_plugin neutron-dynamic-routing https://opendev.org/openstack/neutron-dynamic-routing
|
||||
enable_plugin neutron-tempest-plugin https://opendev.org/openstack/neutron-tempest-plugin
|
||||
EOF
|
||||
|
@ -48,6 +49,7 @@
|
|||
|
||||
export MANILA_SETUP_IPV6=True
|
||||
export RUN_MANILA_IPV6_TESTS=True
|
||||
export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False
|
||||
|
||||
# Basic services needed for minimal job
|
||||
OVERRIDE_ENABLED_SERVICES=key,mysql,rabbit,tempest
|
||||
|
|
|
@ -45,7 +45,7 @@
|
|||
disable_service s-proxy
|
||||
|
||||
enable_plugin manila https://opendev.org/openstack/manila
|
||||
|
||||
enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin
|
||||
enable_plugin devstack-plugin-ceph https://opendev.org/openstack/devstack-plugin-ceph
|
||||
|
||||
# Enable CephFS as the backend for Manila.
|
||||
|
|
|
@ -45,7 +45,7 @@
|
|||
disable_service s-proxy
|
||||
|
||||
enable_plugin manila https://opendev.org/openstack/manila
|
||||
|
||||
enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin
|
||||
enable_plugin devstack-plugin-ceph https://opendev.org/openstack/devstack-plugin-ceph
|
||||
|
||||
# Enable CephFS as the backend for Manila.
|
||||
|
|
Loading…
Reference in New Issue