From 73e9780ad73b962ae78e6443d9b9cd2a17913462 Mon Sep 17 00:00:00 2001 From: Eric Juma Date: Wed, 15 Feb 2017 12:45:31 -0500 Subject: [PATCH] Integrate tempest testing Run tempest API and scenario tests in dsvm_hook excluding failing tests, which are in tempest_blacklist.txt. Also fixes database connection, which is now in /tmp/mixmatch.db instead of memory because it needs to be accessed by multiple workers. Change-Id: Ia3b3906dacd33622ce44a0b034dbd90ba6c980cc --- devstack/mixmatch.sh | 2 +- mixmatch/tests/functional/hooks/dsvm_hook.sh | 13 ++++++++++++- mixmatch/tests/functional/tempest_blacklist.txt | 12 ++++++++++++ 3 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 mixmatch/tests/functional/tempest_blacklist.txt diff --git a/devstack/mixmatch.sh b/devstack/mixmatch.sh index a14daaa..709be64 100644 --- a/devstack/mixmatch.sh +++ b/devstack/mixmatch.sh @@ -26,7 +26,7 @@ function configure_mixmatch { sudo chown $STACK_USER:$STACK_USER /etc/mixmatch cp $MIXMATCH_DIR/etc/mixmatch.conf.sample $MIXMATCH_CONF - iniset $MIXMATCH_CONF database connection "sqlite://" + iniset $MIXMATCH_CONF database connection "sqlite:////tmp/mixmatch.db" iniset $MIXMATCH_CONF DEFAULT port $MIXMATCH_SERVICE_PORT iniset $MIXMATCH_CONF DEFAULT service_providers default iniset $MIXMATCH_CONF DEFAULT aggregation False diff --git a/mixmatch/tests/functional/hooks/dsvm_hook.sh b/mixmatch/tests/functional/hooks/dsvm_hook.sh index f47c7a5..a54738a 100755 --- a/mixmatch/tests/functional/hooks/dsvm_hook.sh +++ b/mixmatch/tests/functional/hooks/dsvm_hook.sh @@ -60,4 +60,15 @@ source openrc admin admin register_mixmatch -exit 0 +# Run tempest API and scenario tests +cd $BASE/new/tempest + +if [ -d .testrepository ]; then + sudo rm -r .testrepository +fi + +sudo chown -R jenkins:stack $BASE/new/tempest +sudo chown -R jenkins:stack /opt/stack/data/tempest + +ostestr -r '(^tempest.api|^tempest.scenario)' --blacklist-file \ + $BASE/new/mixmatch/mixmatch/tests/functional/tempest_blacklist.txt diff --git a/mixmatch/tests/functional/tempest_blacklist.txt b/mixmatch/tests/functional/tempest_blacklist.txt new file mode 100644 index 0000000..b0f08c4 --- /dev/null +++ b/mixmatch/tests/functional/tempest_blacklist.txt @@ -0,0 +1,12 @@ +negative +Negative +tempest.api.image.admin.v2.test_images.BasicAdminOperationsImagesTest.test_admin_deactivate_reactivate_image +tempest.api.image.v2.test_images_metadefs_namespaces.MetadataNamespacesTest.test_basic_metadata_definition_namespaces +tempest.api.volume.admin.v3.test_user_messages.UserMessagesTest.test_delete_message +tempest.api.volume.admin.v3.test_user_messages.UserMessagesTest.test_list_messages +tempest.api.volume.admin.v3.test_user_messages.UserMessagesTest.test_show_message +tempest.api.volume.v2.test_volumes_list.VolumesV2ListTestJSON.test_volume_list_details_pagination +tempest.api.volume.v2.test_volumes_list.VolumesV2ListTestJSON.test_volume_list_pagination + +# Failed only in gerrit due to connection reset +tempest.api.image.v2.test_images_metadefs_namespace_tags.MetadataNamespaceTagsTest.test_create_update_delete_tag