Browse Source

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)
(cherry picked from commit d39d930274)
(cherry picked from commit 195276bfaa)
Signed-off-by: Goutham Pacha Ravi <gouthampravi@gmail.com>
changes/26/725726/2
Goutham Pacha Ravi 2 years ago
parent
commit
58499f378d
  1. 2
      contrib/ci/pre_test_hook.sh
  2. 13
      devstack/plugin.sh
  3. 5
      devstack/settings
  4. 2
      playbooks/legacy/grenade-dsvm-manila/run.yaml
  5. 2
      playbooks/legacy/manila-tempest-dsvm-container-scenario-custom-image/run.yaml
  6. 3
      playbooks/legacy/manila-tempest-dsvm-generic-no-share-servers/run.yaml
  7. 2
      playbooks/legacy/manila-tempest-dsvm-generic-scenario-custom-image/run.yaml
  8. 3
      playbooks/legacy/manila-tempest-dsvm-glusterfs-native-heketi/run.yaml
  9. 3
      playbooks/legacy/manila-tempest-dsvm-glusterfs-native/run.yaml
  10. 3
      playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs-heketi/run.yaml
  11. 3
      playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs/run.yaml
  12. 3
      playbooks/legacy/manila-tempest-dsvm-hdfs/run.yaml
  13. 2
      playbooks/legacy/manila-tempest-dsvm-mysql-generic/run.yaml
  14. 2
      playbooks/legacy/manila-tempest-dsvm-postgres-container/run.yaml
  15. 2
      playbooks/legacy/manila-tempest-dsvm-postgres-generic-singlebackend/run.yaml
  16. 2
      playbooks/legacy/manila-tempest-dsvm-postgres-zfsonlinux/run.yaml
  17. 2
      playbooks/legacy/manila-tempest-dsvm-scenario/run.yaml
  18. 3
      playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native-centos-7/run.yaml
  19. 3
      playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs-centos-7/run.yaml
  20. 2
      playbooks/legacy/manila-tempest-minimal-dsvm-dummy/run.yaml
  21. 2
      playbooks/legacy/manila-tempest-minimal-dsvm-lvm-centos-7/run.yaml
  22. 2
      playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-native-centos-7/run.yaml
  23. 2
      playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-nfs-centos-7/run.yaml

2
contrib/ci/pre_test_hook.sh

@ -41,6 +41,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

13
devstack/plugin.sh

@ -1168,8 +1168,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

5
devstack/settings

@ -202,6 +202,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

2
playbooks/legacy/grenade-dsvm-manila/run.yaml

@ -34,6 +34,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

2
playbooks/legacy/manila-tempest-dsvm-container-scenario-custom-image/run.yaml

@ -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

3
playbooks/legacy/manila-tempest-dsvm-generic-no-share-servers/run.yaml

@ -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
@ -52,6 +53,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.

2
playbooks/legacy/manila-tempest-dsvm-generic-scenario-custom-image/run.yaml

@ -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

3
playbooks/legacy/manila-tempest-dsvm-glusterfs-native-heketi/run.yaml

@ -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

3
playbooks/legacy/manila-tempest-dsvm-glusterfs-native/run.yaml

@ -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

3
playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs-heketi/run.yaml

@ -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

3
playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs/run.yaml

@ -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

3
playbooks/legacy/manila-tempest-dsvm-hdfs/run.yaml

@ -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

2
playbooks/legacy/manila-tempest-dsvm-mysql-generic/run.yaml

@ -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',

2
playbooks/legacy/manila-tempest-dsvm-postgres-container/run.yaml

@ -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
@ -51,6 +52,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',

2
playbooks/legacy/manila-tempest-dsvm-postgres-generic-singlebackend/run.yaml

@ -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
@ -51,6 +52,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',

2
playbooks/legacy/manila-tempest-dsvm-postgres-zfsonlinux/run.yaml

@ -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
@ -51,6 +52,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',

2
playbooks/legacy/manila-tempest-dsvm-scenario/run.yaml

@ -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',

3
playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native-centos-7/run.yaml

@ -39,7 +39,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.
@ -76,6 +76,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

3
playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs-centos-7/run.yaml

@ -39,7 +39,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.
@ -76,6 +76,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

2
playbooks/legacy/manila-tempest-minimal-dsvm-dummy/run.yaml

@ -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
@ -63,6 +64,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',

2
playbooks/legacy/manila-tempest-minimal-dsvm-lvm-centos-7/run.yaml

@ -39,6 +39,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
EOF
@ -56,6 +57,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

2
playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-native-centos-7/run.yaml

@ -46,7 +46,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.

2
playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-nfs-centos-7/run.yaml

@ -46,7 +46,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…
Cancel
Save