Browse Source

Merge "Make manila-tempest-plugin installation optional" into stable/stein

changes/45/726945/1
Zuul 2 months ago
committed by Gerrit Code Review
parent
commit
59805abe09
25 changed files with 67 additions and 8 deletions
  1. +2
    -0
      contrib/ci/pre_test_hook.sh
  2. +11
    -2
      devstack/plugin.sh
  3. +5
    -0
      devstack/settings
  4. +2
    -0
      playbooks/legacy/grenade-dsvm-manila/run.yaml
  5. +2
    -0
      playbooks/legacy/manila-tempest-dsvm-container-scenario-custom-image/run.yaml
  6. +3
    -0
      playbooks/legacy/manila-tempest-dsvm-generic-no-share-servers/run.yaml
  7. +2
    -0
      playbooks/legacy/manila-tempest-dsvm-generic-scenario-custom-image/run.yaml
  8. +3
    -0
      playbooks/legacy/manila-tempest-dsvm-glusterfs-native-heketi/run.yaml
  9. +3
    -0
      playbooks/legacy/manila-tempest-dsvm-glusterfs-native/run.yaml
  10. +3
    -0
      playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs-heketi/run.yaml
  11. +3
    -0
      playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs/run.yaml
  12. +3
    -0
      playbooks/legacy/manila-tempest-dsvm-hdfs/run.yaml
  13. +2
    -0
      playbooks/legacy/manila-tempest-dsvm-mysql-generic/run.yaml
  14. +2
    -0
      playbooks/legacy/manila-tempest-dsvm-postgres-container/run.yaml
  15. +2
    -0
      playbooks/legacy/manila-tempest-dsvm-postgres-generic-singlebackend/run.yaml
  16. +2
    -0
      playbooks/legacy/manila-tempest-dsvm-postgres-zfsonlinux/run.yaml
  17. +2
    -0
      playbooks/legacy/manila-tempest-dsvm-scenario/run.yaml
  18. +2
    -1
      playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native-centos-7/run.yaml
  19. +2
    -1
      playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native/run.yaml
  20. +2
    -1
      playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs-centos-7/run.yaml
  21. +3
    -1
      playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs/run.yaml
  22. +2
    -0
      playbooks/legacy/manila-tempest-minimal-dsvm-dummy/run.yaml
  23. +2
    -0
      playbooks/legacy/manila-tempest-minimal-dsvm-lvm/run.yaml
  24. +1
    -1
      playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-native-centos-7/run.yaml
  25. +1
    -1
      playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-nfs-centos-7/run.yaml

+ 2
- 0
contrib/ci/pre_test_hook.sh View File

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


+ 11
- 2
devstack/plugin.sh View File

@@ -1245,8 +1245,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
- 0
devstack/settings View File

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


+ 2
- 0
playbooks/legacy/grenade-dsvm-manila/run.yaml View File

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



+ 2
- 0
playbooks/legacy/manila-tempest-dsvm-container-scenario-custom-image/run.yaml View File

@@ -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
- 0
playbooks/legacy/manila-tempest-dsvm-generic-no-share-servers/run.yaml View File

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


+ 2
- 0
playbooks/legacy/manila-tempest-dsvm-generic-scenario-custom-image/run.yaml View File

@@ -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
- 0
playbooks/legacy/manila-tempest-dsvm-glusterfs-native-heketi/run.yaml View File

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


+ 3
- 0
playbooks/legacy/manila-tempest-dsvm-glusterfs-native/run.yaml View File

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


+ 3
- 0
playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs-heketi/run.yaml View File

@@ -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
- 0
playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs/run.yaml View File

@@ -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
- 0
playbooks/legacy/manila-tempest-dsvm-hdfs/run.yaml View File

@@ -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
- 0
playbooks/legacy/manila-tempest-dsvm-mysql-generic/run.yaml View File

@@ -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
- 0
playbooks/legacy/manila-tempest-dsvm-postgres-container/run.yaml View File

@@ -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
- 0
playbooks/legacy/manila-tempest-dsvm-postgres-generic-singlebackend/run.yaml View File

@@ -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
- 0
playbooks/legacy/manila-tempest-dsvm-postgres-zfsonlinux/run.yaml View File

@@ -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
- 0
playbooks/legacy/manila-tempest-dsvm-scenario/run.yaml View File

@@ -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
- 1
playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native-centos-7/run.yaml View File

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



+ 2
- 1
playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native/run.yaml View File

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


+ 2
- 1
playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs-centos-7/run.yaml View File

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



+ 3
- 1
playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs/run.yaml View File

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


+ 2
- 0
playbooks/legacy/manila-tempest-minimal-dsvm-dummy/run.yaml View File

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


+ 2
- 0
playbooks/legacy/manila-tempest-minimal-dsvm-lvm/run.yaml View File

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


+ 1
- 1
playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-native-centos-7/run.yaml View File

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


+ 1
- 1
playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-nfs-centos-7/run.yaml View File

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