Use Tempest plugin interface

Manila already start to use the Tempest plugin interface instead
of copying Manila files into Tempest. This removes the burden to
port Manila tests onto Tempest master recurrently.

Change-Id: Ifcfbda33ebe1297bd9da1272016f689393d6c9df
Depends-On: Ie5ed64a6777ed1acf8dd56522c26705ae897596d
This commit is contained in:
Li, Chen 2015-09-10 08:49:47 +08:00
parent 34ea9dc585
commit 6117acd1d4
2 changed files with 7 additions and 6 deletions

View File

@ -73,7 +73,10 @@ set +o errexit
cd $BASE/new/tempest
export MANILA_TEMPEST_CONCURRENCY=${MANILA_TEMPEST_CONCURRENCY:-12}
export MANILA_TESTS=${MANILA_TESTS:-'tempest.api.share*'}
export MANILA_TESTS=${MANILA_TESTS:-'manila_tempest_tests.tests.api*'}
# check if tempest plugin was installed corretly
echo 'import pkg_resources; print list(pkg_resources.iter_entry_points("tempest.test_plugins"))' | python
echo "Running tempest manila test suites"
sudo -H -u jenkins tox -eall $MANILA_TESTS -- --concurrency=$MANILA_TEMPEST_CONCURRENCY
sudo -H -u jenkins tox -eall-plugin $MANILA_TESTS -- --concurrency=$MANILA_TEMPEST_CONCURRENCY

View File

@ -29,12 +29,10 @@ echo 'ENABLE_ISOLATED_METADATA=True' >> $localrc_path
# Go to Tempest dir and checkout stable commit to avoid possible
# incompatibilities for plugin stored in Manila repo.
TEMPEST_COMMIT="489f5e62" # 15 June, 2015
TEMPEST_COMMIT="3b1bb9be3265f" # 28 Aug, 2015
cd $BASE/new/tempest
git checkout $TEMPEST_COMMIT
# Print current Tempest status
git status
# Install Manila Tempest integration
cp -r $BASE/new/manila/contrib/tempest/tempest/* $BASE/new/tempest/tempest