rgw: have tempest tests running in with the script!

Signed-off-by: Ali Maredia <amaredia@redhat.com>

diff --git a/src/test/rgw/test-tempest-tests.sh b/src/test/rgw/test-tempest-tests.sh
index f1027c2a49e7350dab6e3a85d3b6ec61b21e4782..eaed75f10ed98f8e09b96208e8826e5fd83ac6a3 100755 (executable)
--- a/src/test/rgw/test-tempest-tests.sh
+++ b/src/test/rgw/test-tempest-tests.sh
@@ -93,7 +93,7 @@ cd $KEYSTONE_DIR && source .tox/venv/bin/activate && openstack service create --
 cd $KEYSTONE_DIR && source .tox/venv/bin/activate && sleep 3
 
 RGW_ENDPOINT=http://localhost:8000
-cd $KEYSTONE_DIR && source .tox/venv/bin/activate && openstack endpoint create --os-username admin --os-password ADMIN --os-user-domain-id default --os-project-name admin --os-project-domain-id default --os-identity-api-version 3 --os-auth-url $ADMIN_URL swift public "$RGW_ENDPOINT/v1/KEY_$(tenant_id)s" --debug
+cd $KEYSTONE_DIR && source .tox/venv/bin/activate && openstack endpoint create --os-username admin --os-password ADMIN --os-user-domain-id default --os-project-name admin --os-project-domain-id default --os-identity-api-version 3 --os-auth-url $ADMIN_URL swift public "$RGW_ENDPOINT/v1/KEY_\$(tenant_id)s" --debug
 
 # radosgw needs to be started up after this point
 cd $TEST_DIR
@@ -111,22 +111,22 @@ cd $TEMPEST_DIR && source $TOX_DIR/bin/activate && tox -e venv --notest
 cd $TEMPEST_DIR && source .tox/venv/bin/activate && tempest init --workspace-path $TEMPEST_DIR/workspace.yaml rgw
 
 echo "### STEP 10: Configure Instance for Tempest ###"
-cp $TEST_DIR/tempest.conf $TEMPEST_ETC_DIR/tempest.conf
+cp $TEST_DIR/tempest.conf $TEMPEST_DIR/rgw/etc/tempest.conf
 
-echo "### STEP 10: Run Tempest ###"
+echo "### STEP 11: Run Tempest ###"
 cd $TEMPEST_DIR && source .tox/venv/bin/activate && tempest run --workspace-path $TEMPEST_DIR/workspace.yaml --workspace rgw --regex '^tempest.api.object_storage' --black-regex '.*test_account_quotas_negative.AccountQuotasNegativeTest.test_user_modify_quota|.*test_container_acl_negative.ObjectACLsNegativeTest.*|.*test_container_services_negative.ContainerNegativeTest.test_create_container_metadata_.*|.*test_container_staticweb.StaticWebTest.test_web_index|.*test_container_staticweb.StaticWebTest.test_web_listing_css|.*test_container_synchronization.*|.*test_object_services.PublicObjectTest.test_access_public_container_object_without_using_creds|.*test_object_services.ObjectTest.test_create_object_with_transfer_encoding'
 
 echo "### CLEAN UP BEGINNING ###"
 
 cd $TEST_DIR
 #rm -rf $TEMPEST_DIR
-../src/stop.sh
+#../src/stop.sh
 # Stoping Keyston Admin Instance
-kill $KEYSTONE_ADMIN_PID
-# Stoping Keyston Public Instance
-kill $KEYSTONE_PUBLIC_PID
+#kill $KEYSTONE_ADMIN_PID
+## Stoping Keyston Public Instance
+#kill $KEYSTONE_PUBLIC_PID
 
-rm -rf $ARCHIVE_DIR
-rm -rf $KEYSTONE_DIR
-rm -rf $TOX_DIR
+#rm -rf $ARCHIVE_DIR
+#rm -rf $KEYSTONE_DIR
+#rm -rf $TOX_DIR
 echo "### CLEAN UP: Keystone Dir Removed ###"