Browse Source

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
changes/04/221704/3
Bharat Kumar Kobagana 3 years ago
parent
commit
fd30ab5d2e
2 changed files with 7 additions and 7 deletions
  1. 6
    3
      manila/post_test_hook.sh
  2. 1
    4
      manila/pre_test_hook.sh

+ 6
- 3
manila/post_test_hook.sh View File

@@ -74,12 +74,15 @@ set +o errexit
74 74
 cd $BASE/new/tempest
75 75
 
76 76
 export MANILA_TEMPEST_CONCURRENCY=${MANILA_TEMPEST_CONCURRENCY:-12}
77
-export MANILA_TESTS=${MANILA_TESTS:-'tempest.api.share*'}
77
+export MANILA_TESTS=${MANILA_TESTS:-'manila_tempest_tests.tests.api'}
78 78
 
79 79
 if [[ "$JOB_NAME" =~ "scenario" ]]; then
80 80
     echo "Set test set to scenario only"
81
-    MANILA_TESTS='tempest.scenario.*share*'
81
+    MANILA_TESTS='manila_tempest_tests.tests.scenario'
82 82
 fi
83 83
 
84
+# check if tempest plugin was installed correctly
85
+echo 'import pkg_resources; print list(pkg_resources.iter_entry_points("tempest.test_plugins"))' | python
86
+
84 87
 echo "Running tempest manila test suites"
85
-sudo -H -u jenkins tox -eall $MANILA_TESTS -- --concurrency=$MANILA_TEMPEST_CONCURRENCY
88
+sudo -H -u jenkins tox -eall-plugin $MANILA_TESTS -- --concurrency=$MANILA_TEMPEST_CONCURRENCY

+ 1
- 4
manila/pre_test_hook.sh View File

@@ -37,12 +37,9 @@ echo 'ENABLE_ISOLATED_METADATA=True' >> $localrc_path
37 37
 
38 38
 # Go to Tempest dir and checkout stable commit to avoid possible
39 39
 # incompatibilities for plugin stored in Manila repo.
40
-TEMPEST_COMMIT="489f5e62"  # 15 June, 2015
40
+TEMPEST_COMMIT="3b1bb9be3265f"  # 28 Aug, 2015
41 41
 cd $BASE/new/tempest
42 42
 git checkout $TEMPEST_COMMIT
43 43
 
44 44
 # Print current Tempest status
45 45
 git status
46
-
47
-# Install Manila Tempest integration
48
-cp -r $BASE/new/manila/contrib/tempest/tempest/* $BASE/new/tempest/tempest

Loading…
Cancel
Save