diff --git a/acceptance-tests/azure/cf-test-masb-sql-fog-db-subsume.sh b/acceptance-tests/azure/cf-test-masb-sql-fog-db-subsume.sh index 35c8af876..eb4c136be 100755 --- a/acceptance-tests/azure/cf-test-masb-sql-fog-db-subsume.sh +++ b/acceptance-tests/azure/cf-test-masb-sql-fog-db-subsume.sh @@ -26,7 +26,7 @@ shift DB_NAME=subsume-db-$$ RESULT=1 -MASB_SQLDB_INSTANCE_NAME=mssql-db-$$ +MASB_SQLDB_INSTANCE_NAME=mssql-db-$(date +%s) MASB_DB_CONFIG="{ \ \"sqlServerName\": \"${PRIMARY_SERVER_NAME}\", \ \"sqldbName\": \"${DB_NAME}\", \ @@ -35,7 +35,7 @@ MASB_DB_CONFIG="{ \ RESULT=1 if create_service azure-sqldb StandardS0 "${MASB_SQLDB_INSTANCE_NAME}" "${MASB_DB_CONFIG}"; then - MASB_FOG_INSTANCE_NAME=masb-fog-db-$$ + MASB_FOG_INSTANCE_NAME=masb-fog-db-$(date +%s) MASB_FOG_CONFIG="{ \ \"primaryServerName\": \"${PRIMARY_SERVER_NAME}\", \ @@ -101,8 +101,8 @@ if create_service azure-sqldb StandardS0 "${MASB_SQLDB_INSTANCE_NAME}" "${MASB_D fi else echo spring music test failed on masb fog - delete_service "${MASB_FOG_INSTANCE_NAME}" - delete_service "${MASB_SQLDB_INSTANCE_NAME}" + delete_service "${MASB_FOG_INSTANCE_NAME}" || cf purge-service-instance -f "${MASB_FOG_INSTANCE_NAME}" + delete_service "${MASB_SQLDB_INSTANCE_NAME}" || cf purge-service-instance -f "${MASB_SQLDB_INSTANCE_NAME}" fi else delete_service "${MASB_SQLDB_INSTANCE_NAME}"