Browse Source

Fix call of clients in post_test_hook.sh

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
vponomaryov 3 years ago
parent
commit
296c9955ed
1 changed files with 10 additions and 6 deletions
  1. 10
    6
      contrib/ci/post_test_hook.sh

+ 10
- 6
contrib/ci/post_test_hook.sh View File

@@ -193,11 +193,6 @@ iniset $TEMPEST_CONFIG share run_manage_unmanage_tests $RUN_MANILA_MANAGE_TESTS
193 193
 # Enable manage/unmanage snapshot tests
194 194
 iniset $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.
198
-source $BASE/new/manila/contrib/ci/common.sh
199
-manila_wait_for_drivers_init $MANILA_CONF
200
-
201 196
 # check if tempest plugin was installed correctly
202 197
 echo '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 202
 # 2) https://bugs.launchpad.net/tempest/+bug/1524717
208 203
 TEMPEST_CONFIG=$BASE/new/tempest/etc/tempest.conf
209 204
 ADMIN_TENANT_NAME=${ADMIN_TENANT_NAME:-"admin"}
205
+ADMIN_DOMAIN_NAME=${ADMIN_DOMAIN_NAME:-"Default"}
210 206
 ADMIN_PASSWORD=${ADMIN_PASSWORD:-"secretadmin"}
211 207
 iniset $TEMPEST_CONFIG auth admin_username ${ADMIN_USERNAME:-"admin"}
212 208
 iniset $TEMPEST_CONFIG auth admin_password $ADMIN_PASSWORD
213 209
 iniset $TEMPEST_CONFIG auth admin_tenant_name $ADMIN_TENANT_NAME
214
-iniset $TEMPEST_CONFIG auth admin_domain_name ${ADMIN_DOMAIN_NAME:-"Default"}
210
+iniset $TEMPEST_CONFIG auth admin_domain_name $ADMIN_DOMAIN_NAME
215 211
 iniset $TEMPEST_CONFIG identity username ${TEMPEST_USERNAME:-"demo"}
216 212
 iniset $TEMPEST_CONFIG identity password $ADMIN_PASSWORD
217 213
 iniset $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"}
221 217
 iniset $TEMPEST_CONFIG validation ip_version_for_ssh 4
222 218
 iniset $TEMPEST_CONFIG validation network_for_ssh ${PRIVATE_NETWORK_NAME:-"private"}
223 219
 
220
+export OS_PROJECT_DOMAIN_NAME=$ADMIN_DOMAIN_NAME
221
+export 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.
225
+source $BASE/new/manila/contrib/ci/common.sh
226
+manila_wait_for_drivers_init $MANILA_CONF
227
+
224 228
 echo "Running tempest manila test suites"
225 229
 sudo -H -u jenkins tox -eall-plugin $MANILA_TESTS -- --concurrency=$MANILA_TEMPEST_CONCURRENCY

Loading…
Cancel
Save