summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBharat Kumar Kobagana <bharat.kobagana@redhat.com>2015-09-09 16:39:39 +0530
committerBharat Kumar Kobagana <bharat.kobagana@redhat.com>2015-09-12 08:55:29 +0530
commitfd30ab5d2e0cec71df0882a487c6b02cbf298b76 (patch)
tree216961d8a82ffc28828fae9f126bc10f893aca6d
parent84f8ac4718de64ea418dd52fee37497c4e0eea57 (diff)
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
Notes
Notes (review): Verified+2: Jenkins Code-Review+1: Marc Koderer <marc@koderer.com> Code-Review+2: Ramana Raja <rraja@redhat.com> Workflow+1: Ramana Raja <rraja@redhat.com> Code-Review+1: zhaohua <zhaohua.zhao@huawei.com> Submitted-by: Jenkins Submitted-at: Sun, 13 Sep 2015 07:57:56 +0000 Reviewed-on: https://review.openstack.org/221704 Project: stackforge/devstack-plugin-glusterfs Branch: refs/heads/master
-rwxr-xr-xmanila/post_test_hook.sh9
-rwxr-xr-xmanila/pre_test_hook.sh5
2 files changed, 7 insertions, 7 deletions
diff --git a/manila/post_test_hook.sh b/manila/post_test_hook.sh
index bb96f4f..8f29803 100755
--- a/manila/post_test_hook.sh
+++ b/manila/post_test_hook.sh
@@ -74,12 +74,15 @@ set +o errexit
74cd $BASE/new/tempest 74cd $BASE/new/tempest
75 75
76export MANILA_TEMPEST_CONCURRENCY=${MANILA_TEMPEST_CONCURRENCY:-12} 76export MANILA_TEMPEST_CONCURRENCY=${MANILA_TEMPEST_CONCURRENCY:-12}
77export MANILA_TESTS=${MANILA_TESTS:-'tempest.api.share*'} 77export MANILA_TESTS=${MANILA_TESTS:-'manila_tempest_tests.tests.api'}
78 78
79if [[ "$JOB_NAME" =~ "scenario" ]]; then 79if [[ "$JOB_NAME" =~ "scenario" ]]; then
80 echo "Set test set to scenario only" 80 echo "Set test set to scenario only"
81 MANILA_TESTS='tempest.scenario.*share*' 81 MANILA_TESTS='manila_tempest_tests.tests.scenario'
82fi 82fi
83 83
84# check if tempest plugin was installed correctly
85echo 'import pkg_resources; print list(pkg_resources.iter_entry_points("tempest.test_plugins"))' | python
86
84echo "Running tempest manila test suites" 87echo "Running tempest manila test suites"
85sudo -H -u jenkins tox -eall $MANILA_TESTS -- --concurrency=$MANILA_TEMPEST_CONCURRENCY 88sudo -H -u jenkins tox -eall-plugin $MANILA_TESTS -- --concurrency=$MANILA_TEMPEST_CONCURRENCY
diff --git a/manila/pre_test_hook.sh b/manila/pre_test_hook.sh
index 50b8a28..210a365 100755
--- a/manila/pre_test_hook.sh
+++ b/manila/pre_test_hook.sh
@@ -37,12 +37,9 @@ echo 'ENABLE_ISOLATED_METADATA=True' >> $localrc_path
37 37
38# Go to Tempest dir and checkout stable commit to avoid possible 38# Go to Tempest dir and checkout stable commit to avoid possible
39# incompatibilities for plugin stored in Manila repo. 39# incompatibilities for plugin stored in Manila repo.
40TEMPEST_COMMIT="489f5e62" # 15 June, 2015 40TEMPEST_COMMIT="3b1bb9be3265f" # 28 Aug, 2015
41cd $BASE/new/tempest 41cd $BASE/new/tempest
42git checkout $TEMPEST_COMMIT 42git checkout $TEMPEST_COMMIT
43 43
44# Print current Tempest status 44# Print current Tempest status
45git status 45git status
46
47# Install Manila Tempest integration
48cp -r $BASE/new/manila/contrib/tempest/tempest/* $BASE/new/tempest/tempest