fix: update Jobs region (GoogleCloudPlatform#7849)

averikitsch · web-flow · commit b01830598ac8 · 2022-05-03T15:58:14.000Z
## Description Fixes GoogleCloudPlatform#7636 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
diff --git a/run/jobs/e2e_test.py b/run/jobs/e2e_test.py
@@ -30,6 +30,7 @@
 SUFFIX = uuid.uuid4().hex[:10]
 PROJECT = os.environ["GOOGLE_CLOUD_PROJECT"]
 SERVICE = "job-quickstart-" + SUFFIX
+REGION = "us-west1"
 
 
 @pytest.fixture
@@ -45,7 +46,7 @@ def setup_job():
             "--project",
             PROJECT,
             "--substitutions",
-            "_SERVICE=" + SERVICE + ",_VERSION=" + SUFFIX,
+            "_SERVICE=" + SERVICE + ",_VERSION=" + SUFFIX + ",_REGION=" + REGION,
         ]
     )
 
@@ -62,7 +63,7 @@ def setup_job():
             "--project",
             PROJECT,
             "--substitutions",
-            "_SERVICE=" + SERVICE + ",_VERSION=" + SUFFIX,
+            "_SERVICE=" + SERVICE + ",_VERSION=" + SUFFIX + ",_REGION=" + REGION,
         ]
     )
 
@@ -77,7 +78,7 @@ def test_end_to_end(setup_job):
         f"timestamp>=\"{filter_date.isoformat('T')}\" "
         "resource.type=cloud_run_job "
         f"AND resource.labels.job_name={SERVICE} "
-        "resource.labels.location = \"us-central1\" "
+        f"resource.labels.location = \"{REGION}\" "
         "-protoPayload.serviceName=\"run.googleapis.com\""
     )
 
@@ -95,6 +96,6 @@ def test_end_to_end(setup_job):
         if found:
             break
         # Linear backoff
-        time.sleep(x * 5)
+        time.sleep(x * 10)
 
     assert found
diff --git a/run/jobs/e2e_test_cleanup.yaml b/run/jobs/e2e_test_cleanup.yaml
@@ -29,5 +29,5 @@ steps:
 substitutions:
   _SERVICE: logger-job
   _VERSION: manual
-  _REGION: us-central1
+  _REGION: us-west1
 
diff --git a/run/jobs/e2e_test_setup.yaml b/run/jobs/e2e_test_setup.yaml
@@ -47,4 +47,4 @@ steps:
 substitutions:
   _SERVICE: logger-job
   _VERSION: manual
-  _REGION: us-central1
+  _REGION: us-west1
