summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvponomaryov <vponomaryov@mirantis.com>2016-03-19 16:40:58 +0200
committervponomaryov <vponomaryov@mirantis.com>2016-03-19 16:58:01 +0200
commit296c9955edae4f25b5b120ff5df7ccd1569984d6 (patch)
treebd5c79efd66b8ae4fb5c75af52eb149a399077b1
parentc2a4225f6bf78ec5fd47aded6ef8c3f28fb33165 (diff)
Fix call of clients in post_test_hook.sh2.0.0.0rc12.0.0
With merge of commit [1] all calls of clients in Manila post_test_hook.sh script fail, because used Devstack's file 'openrc' does not export env var that contains domain name. That became required after switch to Keystone v3 API in CI jobs [1]. Note: manilaclient calls should have been worked, as default values are automatically picked up by Keystone server. But such clients as nova requires set of domain name explicitly. [1] Ic211a11308a3295409467efd88bff413482ee58d Change-Id: Ia1976af058164da8ef9e33296006750aab7b3f50 Closes-Bug: #1559456
Notes
Notes (review): Code-Review+2: Ben Swartzlander <ben@swartzlander.org> Code-Review+2: Rodrigo Barbieri <rodrigo.barbieri2010@gmail.com> Workflow+1: Rodrigo Barbieri <rodrigo.barbieri2010@gmail.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Sat, 19 Mar 2016 18:14:51 +0000 Reviewed-on: https://review.openstack.org/294918 Project: openstack/manila Branch: refs/heads/master
-rwxr-xr-xcontrib/ci/post_test_hook.sh16
1 files changed, 10 insertions, 6 deletions
diff --git a/contrib/ci/post_test_hook.sh b/contrib/ci/post_test_hook.sh
index 484a6ab..48c3738 100755
--- a/contrib/ci/post_test_hook.sh
+++ b/contrib/ci/post_test_hook.sh
@@ -193,11 +193,6 @@ iniset $TEMPEST_CONFIG share run_manage_unmanage_tests $RUN_MANILA_MANAGE_TESTS
193# Enable manage/unmanage snapshot tests 193# Enable manage/unmanage snapshot tests
194iniset $TEMPEST_CONFIG share run_manage_unmanage_snapshot_tests $RUN_MANILA_MANAGE_SNAPSHOT_TESTS 194iniset $TEMPEST_CONFIG share run_manage_unmanage_snapshot_tests $RUN_MANILA_MANAGE_SNAPSHOT_TESTS
195 195
196# Also, we should wait until service VM is available
197# before running Tempest tests using Generic driver in DHSS=False mode.
198source $BASE/new/manila/contrib/ci/common.sh
199manila_wait_for_drivers_init $MANILA_CONF
200
201# check if tempest plugin was installed correctly 196# check if tempest plugin was installed correctly
202echo 'import pkg_resources; print list(pkg_resources.iter_entry_points("tempest.test_plugins"))' | python 197echo 'import pkg_resources; print list(pkg_resources.iter_entry_points("tempest.test_plugins"))' | python
203 198
@@ -207,11 +202,12 @@ echo 'import pkg_resources; print list(pkg_resources.iter_entry_points("tempest.
207# 2) https://bugs.launchpad.net/tempest/+bug/1524717 202# 2) https://bugs.launchpad.net/tempest/+bug/1524717
208TEMPEST_CONFIG=$BASE/new/tempest/etc/tempest.conf 203TEMPEST_CONFIG=$BASE/new/tempest/etc/tempest.conf
209ADMIN_TENANT_NAME=${ADMIN_TENANT_NAME:-"admin"} 204ADMIN_TENANT_NAME=${ADMIN_TENANT_NAME:-"admin"}
205ADMIN_DOMAIN_NAME=${ADMIN_DOMAIN_NAME:-"Default"}
210ADMIN_PASSWORD=${ADMIN_PASSWORD:-"secretadmin"} 206ADMIN_PASSWORD=${ADMIN_PASSWORD:-"secretadmin"}
211iniset $TEMPEST_CONFIG auth admin_username ${ADMIN_USERNAME:-"admin"} 207iniset $TEMPEST_CONFIG auth admin_username ${ADMIN_USERNAME:-"admin"}
212iniset $TEMPEST_CONFIG auth admin_password $ADMIN_PASSWORD 208iniset $TEMPEST_CONFIG auth admin_password $ADMIN_PASSWORD
213iniset $TEMPEST_CONFIG auth admin_tenant_name $ADMIN_TENANT_NAME 209iniset $TEMPEST_CONFIG auth admin_tenant_name $ADMIN_TENANT_NAME
214iniset $TEMPEST_CONFIG auth admin_domain_name ${ADMIN_DOMAIN_NAME:-"Default"} 210iniset $TEMPEST_CONFIG auth admin_domain_name $ADMIN_DOMAIN_NAME
215iniset $TEMPEST_CONFIG identity username ${TEMPEST_USERNAME:-"demo"} 211iniset $TEMPEST_CONFIG identity username ${TEMPEST_USERNAME:-"demo"}
216iniset $TEMPEST_CONFIG identity password $ADMIN_PASSWORD 212iniset $TEMPEST_CONFIG identity password $ADMIN_PASSWORD
217iniset $TEMPEST_CONFIG identity tenant_name ${TEMPEST_TENANT_NAME:-"demo"} 213iniset $TEMPEST_CONFIG identity tenant_name ${TEMPEST_TENANT_NAME:-"demo"}
@@ -221,5 +217,13 @@ iniset $TEMPEST_CONFIG identity alt_tenant_name ${ALT_TENANT_NAME:-"alt_demo"}
221iniset $TEMPEST_CONFIG validation ip_version_for_ssh 4 217iniset $TEMPEST_CONFIG validation ip_version_for_ssh 4
222iniset $TEMPEST_CONFIG validation network_for_ssh ${PRIVATE_NETWORK_NAME:-"private"} 218iniset $TEMPEST_CONFIG validation network_for_ssh ${PRIVATE_NETWORK_NAME:-"private"}
223 219
220export OS_PROJECT_DOMAIN_NAME=$ADMIN_DOMAIN_NAME
221export OS_USER_DOMAIN_NAME=$ADMIN_DOMAIN_NAME
222
223# Also, we should wait until service VM is available
224# before running Tempest tests using Generic driver in DHSS=False mode.
225source $BASE/new/manila/contrib/ci/common.sh
226manila_wait_for_drivers_init $MANILA_CONF
227
224echo "Running tempest manila test suites" 228echo "Running tempest manila test suites"
225sudo -H -u jenkins tox -eall-plugin $MANILA_TESTS -- --concurrency=$MANILA_TEMPEST_CONCURRENCY 229sudo -H -u jenkins tox -eall-plugin $MANILA_TESTS -- --concurrency=$MANILA_TEMPEST_CONCURRENCY