Fix overlap in sql db creation in E2E tests (#7187)

## Description

Fixes #7136 
Fixes #6636 

Note: It's a good idea to open an issue first for discussion.

## Checklist
- [ ] I have followed [Sample Guidelines from AUTHORING_GUIDE.MD](https://github.com/GoogleCloudPlatform/python-docs-samples/blob/main/AUTHORING_GUIDE.md)
- [ ] README is updated to include [all relevant information](https://github.com/GoogleCloudPlatform/python-docs-samples/blob/main/AUTHORING_GUIDE.md#readme-file)
- [ ] **Tests** pass:   `nox -s py-3.6` (see [Test Environment Setup](https://github.com/GoogleCloudPlatform/python-docs-samples/blob/main/AUTHORING_GUIDE.md#test-environment-setup))
- [ ] **Lint** pass:   `nox -s lint` (see [Test Environment Setup](https://github.com/GoogleCloudPlatform/python-docs-samples/blob/main/AUTHORING_GUIDE.md#test-environment-setup))
- [ ] These samples need a new **API enabled** in testing projects to pass (let us know which ones)
- [ ] These samples need a new/updated **env vars** in testing projects set to pass (let us know which ones)
- [ ] Please **merge** this PR for me once it is approved.
- [ ] This sample adds a new sample directory, and I updated the [CODEOWNERS file](https://github.com/GoogleCloudPlatform/python-docs-samples/blob/main/.github/CODEOWNERS) with the codeowners for this sample

Author: averikitsch

run/django/test/e2e_test_cleanup.yaml

@@ -32,9 +32,9 @@ steps:
           "gcloud container images delete gcr.io/${PROJECT_ID}/${_SERVICE}:${_VERSION} --quiet"
 
         ./test/retry.sh "gcloud run services describe ${_SERVICE} --region ${_REGION} --platform ${_PLATFORM}" \
-          "gcloud run services delete ${_SERVICE} --region ${_REGION} --platform ${_PLATFORM} --quiet"
+          "gcloud run services delete ${_SERVICE} --region ${_REGION} --platform ${_PLATFORM} --async --quiet"
 
-        ./test/retry.sh "gcloud sql databases describe ${_DB_NAME} --instance ${_DB_INSTANCE} --project $PROJECT_ID" \
+        WAIT=30 ./test/retry.sh "gcloud sql databases describe ${_DB_NAME} --instance ${_DB_INSTANCE} --project $PROJECT_ID" \
           "gcloud sql databases delete ${_DB_NAME} --instance ${_DB_INSTANCE} --quiet --project $PROJECT_ID"
 
         ./test/retry.sh "gcloud sql users list --filter \"name=${_DB_USER}\" --instance ${_DB_INSTANCE}" \

run/django/test/e2e_test_setup.yaml

@@ -19,7 +19,7 @@ steps:
     args:
       - "-c"
       - |
-        ./test/retry.sh "gcloud sql databases create ${_DB_NAME} \
+        WAIT=30 ./test/retry.sh "gcloud sql databases create ${_DB_NAME} \
           --instance ${_DB_INSTANCE} \
           --project ${PROJECT_ID}"
 

run/django/test/retry.sh

@@ -48,7 +48,7 @@ runIfSuccessful() {
 # Define max retries
 max_attempts=3;
 attempt_num=1;
-
+seconds="${WAIT:=2}"
 arg1="$1"
 arg2="$2"
 
@@ -67,6 +67,6 @@ do
         exit 1
     else
         echo "Attempt $attempt_num / $max_attempts failed!"
-        sleep $((attempt_num++))
+        sleep $(( seconds*attempt_num++ ))
     fi
 done

run/idp-sql/test/e2e_test_cleanup.yaml

@@ -29,7 +29,7 @@ steps:
       ./test/retry.sh "gcloud container images describe gcr.io/${PROJECT_ID}/${_SERVICE}:${_VERSION}" \
         "gcloud container images delete gcr.io/${PROJECT_ID}/${_SERVICE}:${_VERSION} --quiet"
 
-      ./test/retry.sh "gcloud sql databases describe ${_DB_NAME} --instance ${_DB_INSTANCE} --project $PROJECT_ID" \
+      WAIT=30 ./test/retry.sh "gcloud sql databases describe ${_DB_NAME} --instance ${_DB_INSTANCE} --project $PROJECT_ID" \
         "gcloud sql databases delete ${_DB_NAME} --instance ${_DB_INSTANCE} --quiet --project $PROJECT_ID"
 
 substitutions:

run/idp-sql/test/e2e_test_setup.yaml

@@ -20,7 +20,7 @@ steps:
   args:
     - '-c'
     - |
-      ./test/retry.sh "gcloud sql databases create ${_DB_NAME} \
+      WAIT=30 ./test/retry.sh "gcloud sql databases create ${_DB_NAME} \
         --instance ${_DB_INSTANCE} \
         --project $PROJECT_ID"
 

run/idp-sql/test/retry.sh

@@ -48,7 +48,7 @@ runIfSuccessful() {
 # Define max retries
 max_attempts=3;
 attempt_num=1;
-
+seconds="${WAIT:=2}"
 arg1="$1"
 arg2="$2"
 
@@ -67,6 +67,6 @@ do
         exit 1
     else
         echo "Attempt $attempt_num / $max_attempts failed!"
-        sleep $((attempt_num++))
+        sleep $(( seconds*attempt_num++ ))
     fi
 done