diff --git a/contrib/ci/pre_test_hook.sh b/contrib/ci/pre_test_hook.sh index 224a29a30b..dc5f340deb 100755 --- a/contrib/ci/pre_test_hook.sh +++ b/contrib/ci/pre_test_hook.sh @@ -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 diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 0a15ef85ae..675e3110de 100755 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -1252,8 +1252,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 diff --git a/devstack/settings b/devstack/settings index 5d4cb5b017..4e98fe3992 100644 --- a/devstack/settings +++ b/devstack/settings @@ -212,6 +212,11 @@ MANILA_DATA_COPY_CHECK_HASH=${MANILA_DATA_COPY_CHECK_HASH:=True} MANILA_SETUP_IPV6=${MANILA_SETUP_IPV6:=False} MANILA_RESTORE_IPV6_DEFAULT_ROUTE=${MANILA_RESTORE_IPV6_DEFAULT_ROUTE:=True} +# 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 diff --git a/playbooks/legacy/grenade-dsvm-manila/run.yaml b/playbooks/legacy/grenade-dsvm-manila/run.yaml index d28b3e8f35..fc0195d24c 100644 --- a/playbooks/legacy/grenade-dsvm-manila/run.yaml +++ b/playbooks/legacy/grenade-dsvm-manila/run.yaml @@ -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 diff --git a/playbooks/legacy/manila-tempest-dsvm-container-scenario-custom-image/run.yaml b/playbooks/legacy/manila-tempest-dsvm-container-scenario-custom-image/run.yaml index 99c185602a..418576f572 100644 --- a/playbooks/legacy/manila-tempest-dsvm-container-scenario-custom-image/run.yaml +++ b/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 diff --git a/playbooks/legacy/manila-tempest-dsvm-generic-no-share-servers/run.yaml b/playbooks/legacy/manila-tempest-dsvm-generic-no-share-servers/run.yaml index 6516c6b99c..5f85edc476 100644 --- a/playbooks/legacy/manila-tempest-dsvm-generic-no-share-servers/run.yaml +++ b/playbooks/legacy/manila-tempest-dsvm-generic-no-share-servers/run.yaml @@ -31,6 +31,7 @@ [[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 chdir: '{{ ansible_user_dir }}/workspace' @@ -53,6 +54,8 @@ export DEVSTACK_GATE_USE_PYTHON3=True + 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. diff --git a/playbooks/legacy/manila-tempest-dsvm-generic-scenario-custom-image/run.yaml b/playbooks/legacy/manila-tempest-dsvm-generic-scenario-custom-image/run.yaml index e87e180837..70a6324e95 100644 --- a/playbooks/legacy/manila-tempest-dsvm-generic-scenario-custom-image/run.yaml +++ b/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 diff --git a/playbooks/legacy/manila-tempest-dsvm-glusterfs-native-heketi/run.yaml b/playbooks/legacy/manila-tempest-dsvm-glusterfs-native-heketi/run.yaml index a9ebf82c0e..be5f447ecd 100644 --- a/playbooks/legacy/manila-tempest-dsvm-glusterfs-native-heketi/run.yaml +++ b/playbooks/legacy/manila-tempest-dsvm-glusterfs-native-heketi/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 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 diff --git a/playbooks/legacy/manila-tempest-dsvm-glusterfs-native/run.yaml b/playbooks/legacy/manila-tempest-dsvm-glusterfs-native/run.yaml index 2aaa691893..75a80bd515 100644 --- a/playbooks/legacy/manila-tempest-dsvm-glusterfs-native/run.yaml +++ b/playbooks/legacy/manila-tempest-dsvm-glusterfs-native/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 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 diff --git a/playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs-heketi/run.yaml b/playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs-heketi/run.yaml index 7b8de69467..cf62df51d2 100644 --- a/playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs-heketi/run.yaml +++ b/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 diff --git a/playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs/run.yaml b/playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs/run.yaml index e9b088b133..ffe121fb52 100644 --- a/playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs/run.yaml +++ b/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 diff --git a/playbooks/legacy/manila-tempest-dsvm-hdfs/run.yaml b/playbooks/legacy/manila-tempest-dsvm-hdfs/run.yaml index aa83ef4f76..4863f065db 100644 --- a/playbooks/legacy/manila-tempest-dsvm-hdfs/run.yaml +++ b/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 diff --git a/playbooks/legacy/manila-tempest-dsvm-mysql-generic/run.yaml b/playbooks/legacy/manila-tempest-dsvm-mysql-generic/run.yaml index f8853ff35a..e49f18d56e 100644 --- a/playbooks/legacy/manila-tempest-dsvm-mysql-generic/run.yaml +++ b/playbooks/legacy/manila-tempest-dsvm-mysql-generic/run.yaml @@ -50,6 +50,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 export DEVSTACK_GATE_USE_PYTHON3=True diff --git a/playbooks/legacy/manila-tempest-dsvm-postgres-container/run.yaml b/playbooks/legacy/manila-tempest-dsvm-postgres-container/run.yaml index c0bea8b1a9..7e6a7cd3a0 100644 --- a/playbooks/legacy/manila-tempest-dsvm-postgres-container/run.yaml +++ b/playbooks/legacy/manila-tempest-dsvm-postgres-container/run.yaml @@ -50,6 +50,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 export DEVSTACK_GATE_USE_PYTHON3=True diff --git a/playbooks/legacy/manila-tempest-dsvm-postgres-generic-singlebackend/run.yaml b/playbooks/legacy/manila-tempest-dsvm-postgres-generic-singlebackend/run.yaml index 33699630fa..f77fdabe40 100644 --- a/playbooks/legacy/manila-tempest-dsvm-postgres-generic-singlebackend/run.yaml +++ b/playbooks/legacy/manila-tempest-dsvm-postgres-generic-singlebackend/run.yaml @@ -50,6 +50,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 export DEVSTACK_GATE_USE_PYTHON3=True diff --git a/playbooks/legacy/manila-tempest-dsvm-postgres-zfsonlinux/run.yaml b/playbooks/legacy/manila-tempest-dsvm-postgres-zfsonlinux/run.yaml index 2a9c0a7dcb..e091f9cc5a 100644 --- a/playbooks/legacy/manila-tempest-dsvm-postgres-zfsonlinux/run.yaml +++ b/playbooks/legacy/manila-tempest-dsvm-postgres-zfsonlinux/run.yaml @@ -50,6 +50,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 export DEVSTACK_GATE_USE_PYTHON3=True diff --git a/playbooks/legacy/manila-tempest-dsvm-scenario/run.yaml b/playbooks/legacy/manila-tempest-dsvm-scenario/run.yaml index a05b8edbd8..c7ea443b96 100644 --- a/playbooks/legacy/manila-tempest-dsvm-scenario/run.yaml +++ b/playbooks/legacy/manila-tempest-dsvm-scenario/run.yaml @@ -50,6 +50,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 export DEVSTACK_GATE_USE_PYTHON3=True diff --git a/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native-centos-7/run.yaml b/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native-centos-7/run.yaml index b41ee56869..80659893f1 100644 --- a/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native-centos-7/run.yaml +++ b/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native-centos-7/run.yaml @@ -64,6 +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 @@ -101,6 +102,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 diff --git a/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native/run.yaml b/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native/run.yaml index 996e3331fd..70c002c034 100644 --- a/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native/run.yaml +++ b/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native/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 enable_plugin devstack-plugin-ceph https://opendev.org/openstack/devstack-plugin-ceph @@ -70,6 +71,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 { diff --git a/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs-centos-7/run.yaml b/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs-centos-7/run.yaml index 7b90b3afe5..b3776a4b54 100644 --- a/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs-centos-7/run.yaml +++ b/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs-centos-7/run.yaml @@ -64,6 +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 @@ -101,6 +102,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 diff --git a/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs/run.yaml b/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs/run.yaml index 9565aed0c6..40558a3e02 100644 --- a/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs/run.yaml +++ b/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs/run.yaml @@ -65,6 +65,7 @@ export PYTHONUNBUFFERED=true export DEVSTACK_GATE_NEUTRON=1 export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient" + export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False export MANILA_SETUP_IPV6=True export RUN_MANILA_IPV6_TESTS=True diff --git a/playbooks/legacy/manila-tempest-minimal-dsvm-dummy-py2/run.yaml b/playbooks/legacy/manila-tempest-minimal-dsvm-dummy-py2/run.yaml index a6e0bd45be..f6cc1c0155 100644 --- a/playbooks/legacy/manila-tempest-minimal-dsvm-dummy-py2/run.yaml +++ b/playbooks/legacy/manila-tempest-minimal-dsvm-dummy-py2/run.yaml @@ -49,6 +49,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', diff --git a/playbooks/legacy/manila-tempest-minimal-dsvm-dummy/run.yaml b/playbooks/legacy/manila-tempest-minimal-dsvm-dummy/run.yaml index cabec9ca57..293ff20616 100644 --- a/playbooks/legacy/manila-tempest-minimal-dsvm-dummy/run.yaml +++ b/playbooks/legacy/manila-tempest-minimal-dsvm-dummy/run.yaml @@ -49,6 +49,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 export DEVSTACK_GATE_USE_PYTHON3=True diff --git a/playbooks/legacy/manila-tempest-minimal-dsvm-lvm/run.yaml b/playbooks/legacy/manila-tempest-minimal-dsvm-lvm/run.yaml index 834ff28313..61234f3a60 100644 --- a/playbooks/legacy/manila-tempest-minimal-dsvm-lvm/run.yaml +++ b/playbooks/legacy/manila-tempest-minimal-dsvm-lvm/run.yaml @@ -49,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