From 55839ca8db8f549ceb19b5d48ddbbf8615aae3c4 Mon Sep 17 00:00:00 2001 From: Noam Bloom Date: Mon, 16 May 2016 16:15:02 +0300 Subject: [PATCH] Tempest Fix for Gate Note that the change under utils.py results in a failure when trying to run the tempests via regular methods e.g. nosetests If this change will hold in gate, more changes to the tempest_tests dir will be needed. For now, run tempests using testr: From within /opt/stack/tempest: 'testr run vitrage_tempest_tests' Change-Id: I7825514493ae0e8461a1a02fb5a20e1b5fe0d8ac --- devstack/files/tempest/tempest.conf | 4 ++-- devstack/post_test_hook.sh | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/devstack/files/tempest/tempest.conf b/devstack/files/tempest/tempest.conf index 9fc5e0a0f..77af8d996 100644 --- a/devstack/files/tempest/tempest.conf +++ b/devstack/files/tempest/tempest.conf @@ -33,7 +33,7 @@ admin_role = admin # API key to use when authenticating. (string value) # This option is deprecated for removal. # Its value may be silently ignored in the future. -password = password +password = secretadmin # The identity region name to use. Also used as the other services' @@ -80,4 +80,4 @@ admin_project_name = admin # authenticating requests made by project isolation to create users # and projects (string value) # Deprecated group/name - [identity]/admin_password -admin_password = password +admin_password = secretadmin diff --git a/devstack/post_test_hook.sh b/devstack/post_test_hook.sh index af572b018..66402ffd1 100644 --- a/devstack/post_test_hook.sh +++ b/devstack/post_test_hook.sh @@ -28,7 +28,9 @@ sudo cp $BASE/new/tempest/etc/logging.conf.sample $BASE/new/tempest/etc/logging. (cd $BASE/new/vitrage/; sudo pip install -r requirements.txt -r test-requirements.txt) (cd $BASE/new/vitrage/; sudo python setup.py install) +(cd $BASE/new/tempest/; sudo rm -rf .testrepository) (cd $BASE/new/tempest/; sudo testr init) +(cd $BASE/new/tempest/; sudo sh -c 'testr list-tests vitrage_tempest_tests') (cd $BASE/new/tempest/; sudo sh -c 'testr list-tests vitrage_tempest_tests | grep -E "topology" > vitrage_tempest_tests.list') (cd $BASE/new/tempest/; sudo sh -c 'testr run --subunit --load-list=vitrage_tempest_tests.list | subunit-trace --fails')