Manila-GlusterFS: Use Tempest plugin interface
This patch modifies the pre_, post_ test_hook.sh scripts to use new tempest plugin interface as per below patch: https://review.openstack.org/#/c/201955/ Closes-Bug: #1493802 Change-Id: I267fd14eb6324e533b32ae0bea2f3ecafac6fbc4
This commit is contained in:
parent
84f8ac4718
commit
fd30ab5d2e
|
@ -74,12 +74,15 @@ set +o errexit
|
||||||
cd $BASE/new/tempest
|
cd $BASE/new/tempest
|
||||||
|
|
||||||
export MANILA_TEMPEST_CONCURRENCY=${MANILA_TEMPEST_CONCURRENCY:-12}
|
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'}
|
||||||
|
|
||||||
if [[ "$JOB_NAME" =~ "scenario" ]]; then
|
if [[ "$JOB_NAME" =~ "scenario" ]]; then
|
||||||
echo "Set test set to scenario only"
|
echo "Set test set to scenario only"
|
||||||
MANILA_TESTS='tempest.scenario.*share*'
|
MANILA_TESTS='manila_tempest_tests.tests.scenario'
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# check if tempest plugin was installed correctly
|
||||||
|
echo 'import pkg_resources; print list(pkg_resources.iter_entry_points("tempest.test_plugins"))' | python
|
||||||
|
|
||||||
echo "Running tempest manila test suites"
|
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
|
||||||
|
|
|
@ -37,12 +37,9 @@ echo 'ENABLE_ISOLATED_METADATA=True' >> $localrc_path
|
||||||
|
|
||||||
# Go to Tempest dir and checkout stable commit to avoid possible
|
# Go to Tempest dir and checkout stable commit to avoid possible
|
||||||
# incompatibilities for plugin stored in Manila repo.
|
# incompatibilities for plugin stored in Manila repo.
|
||||||
TEMPEST_COMMIT="489f5e62" # 15 June, 2015
|
TEMPEST_COMMIT="3b1bb9be3265f" # 28 Aug, 2015
|
||||||
cd $BASE/new/tempest
|
cd $BASE/new/tempest
|
||||||
git checkout $TEMPEST_COMMIT
|
git checkout $TEMPEST_COMMIT
|
||||||
|
|
||||||
# Print current Tempest status
|
# Print current Tempest status
|
||||||
git status
|
git status
|
||||||
|
|
||||||
# Install Manila Tempest integration
|
|
||||||
cp -r $BASE/new/manila/contrib/tempest/tempest/* $BASE/new/tempest/tempest
|
|
||||||
|
|
Loading…
Reference in New Issue