Fetch and install manila-tempest-plugin system-wide
And don't enlist manila-tempest-plugin for installation in venv-tempest. Change-Id: I0844cdb48b9d415bd341c4687620412178be871b Signed-off-by: Rishabh Dave <ridave@redhat.com>
This commit is contained in:
parent
a07d522970
commit
72f79e5c57
@ -356,7 +356,9 @@ if ! [[ -z "$OVERRIDE_IP_FOR_NFS_ACCESS" ]]; then
|
||||
fi
|
||||
|
||||
echo "Running tempest manila test suites"
|
||||
sudo -H -u $USER tox -eall -- $MANILA_TESTS --concurrency=$MANILA_TEMPEST_CONCURRENCY
|
||||
cd $BASE/new/tempest/
|
||||
sudo -H -u $USER tempest run -r $MANILA_TESTS --concurrency=$MANILA_TEMPEST_CONCURRENCY
|
||||
cd -
|
||||
RETVAL=$?
|
||||
|
||||
|
||||
@ -378,7 +380,9 @@ if [[ "$DRIVER" == "dummy" ]]; then
|
||||
manila type-key default set driver_handles_share_servers=False
|
||||
|
||||
echo "Running tempest manila test suites for DHSS=False mode"
|
||||
sudo -H -u $USER tox -eall -- $MANILA_TESTS --concurrency=$MANILA_TEMPEST_CONCURRENCY
|
||||
cd $BASE/new/tempest/
|
||||
sudo -H -u $USER tempest run -r $MANILA_TESTS --concurrency=$MANILA_TEMPEST_CONCURRENCY
|
||||
cd -
|
||||
RETVAL2=$?
|
||||
save_tempest_results 2
|
||||
|
||||
|
@ -843,6 +843,15 @@ function stop_manila {
|
||||
done
|
||||
}
|
||||
|
||||
function install_manila_tempest_plugin {
|
||||
MANILA_TEMPEST_PLUGIN_REPO=${MANILA_TEMPEST_PLUGIN_REPO:-${GIT_BASE}/openstack/manila-tempest-plugin.git}
|
||||
MANILA_TEMPEST_PLUGIN_BRANCH=${MANILA_TEMPEST_PLUGIN_BRANCH:-master}
|
||||
MANILA_TEMPEST_PLUGIN_DIR=$DEST/manila-tempest-plugin
|
||||
|
||||
git_clone $MANILA_TEMPEST_PLUGIN_REPO $MANILA_TEMPEST_PLUGIN_DIR $MANILA_TEMPEST_PLUGIN_BRANCH
|
||||
setup_develop $MANILA_TEMPEST_PLUGIN_DIR
|
||||
}
|
||||
|
||||
# update_tempest - Function used for updating Tempest config if Tempest service enabled
|
||||
function update_tempest {
|
||||
if is_service_enabled tempest; then
|
||||
@ -1147,6 +1156,8 @@ elif [[ "$1" == "stack" && "$2" == "test-config" ]]; then
|
||||
fi
|
||||
###########################################################################
|
||||
|
||||
echo_summary "Fetching and installing manila-tempest-plugin system-wide"
|
||||
install_manila_tempest_plugin
|
||||
echo_summary "Update Tempest config"
|
||||
update_tempest
|
||||
fi
|
||||
|
@ -192,13 +192,6 @@ MANILA_DATA_NODE_IP=${MANILA_DATA_NODE_IP:=$MANILA_ADMIN_NET_RANGE}
|
||||
# Data Service copy validation
|
||||
MANILA_DATA_COPY_CHECK_HASH=${MANILA_DATA_COPY_CHECK_HASH:=True}
|
||||
|
||||
MANILA_TEMPEST_PLUGIN_PATH=$DEST/manila-tempest-plugin
|
||||
if [[ $TEMPEST_PLUGINS != 0 ]] ; then
|
||||
TEMPEST_PLUGINS="$MANILA_TEMPEST_PLUGIN_PATH $TEMPEST_PLUGINS"
|
||||
else
|
||||
TEMPEST_PLUGINS=$MANILA_TEMPEST_PLUGIN_PATH
|
||||
fi
|
||||
|
||||
# Manila IPv6 Setup flag
|
||||
MANILA_SETUP_IPV6=${MANILA_SETUP_IPV6:=False}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user