Merge "Support manila with python3"
This commit is contained in:
commit
ed50be6dd4
@ -928,6 +928,9 @@ function setup_packages_for_manila_on_ubuntu {
|
||||
configure_repo_ceph "apt" "luminous" "ubuntu" "$os_CODENAME"
|
||||
configure_repo_nfsganesha "apt" "ceph_luminous" "ubuntu" "$os_CODENAME"
|
||||
fi
|
||||
if python3_enabled; then
|
||||
CEPH_PACKAGES="${CEPH_PACKAGES} python3-cephfs"
|
||||
fi
|
||||
else # Native driver
|
||||
if ! [[ $os_CODENAME =~ (bionic|xenial|trusty) ]]; then
|
||||
die $LINENO "Need Ubuntu trusty or newer to setup Manila with CephFS native driver"
|
||||
@ -942,6 +945,9 @@ function setup_packages_for_manila_on_ubuntu {
|
||||
else # bionic repos are already there in the distro
|
||||
CEPH_PACKAGES="${CEPH_PACKAGES} ceph-mds libcephfs2"
|
||||
fi
|
||||
if python3_enabled; then
|
||||
CEPH_PACKAGES="${CEPH_PACKAGES} python3-cephfs"
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
|
@ -126,9 +126,6 @@ set +o errexit
|
||||
cd $BASE/new/tempest
|
||||
|
||||
|
||||
# Check whether tempest plugin was installed correctly.
|
||||
echo 'import pkg_resources; print list(pkg_resources.iter_entry_points("tempest.test_plugins"))' | python
|
||||
|
||||
# Workaround for Tempest architectural changes
|
||||
# See bugs:
|
||||
# 1) https://bugs.launchpad.net/manila/+bug/1531049
|
||||
@ -157,4 +154,5 @@ elif [[ $MANILA_TEST_TYPE == 'scenario' ]]; then
|
||||
fi
|
||||
export MANILA_TEMPEST_CONCURRENCY=${MANILA_TEMPEST_CONCURRENCY:-12}
|
||||
|
||||
sudo -H -u $USER tempest list-plugins
|
||||
sudo -H -u $USER tempest run -r $MANILA_TESTS --concurrency=$MANILA_TEMPEST_CONCURRENCY
|
||||
|
Loading…
Reference in New Issue
Block a user