chore: update the filesystem sample tests (GoogleCloudPlatform#9112)

averikitsch · kweinmeister · web-flow · commit 755e8bbe10b0 · 2023-02-14T08:13:38.000-06:00
* update filesystem sample

* lint

* fix

* Update cloudbuild.yaml

---------

Co-authored-by: Karl Weinmeister &lt;11586922+kweinmeister@users.noreply.github.com&gt;
diff --git a/run/filesystem/cloudbuild.yaml b/run/filesystem/cloudbuild.yaml
@@ -10,31 +10,23 @@
 # limitations under the License.
 
 steps:
-  - id: "Docker build"
-    name: "gcr.io/cloud-builders/docker"
-    args:
-      ["build", "-t", "${_AR_REPO_URL}/filesystem-e2e-test:${BUILD_ID}", "."]
-  - id: "Docker push to Artifact Registry"
-    name: "gcr.io/cloud-builders/docker"
-    args: ["push", "${_AR_REPO_URL}/filesystem-e2e-test:${BUILD_ID}"]
   - id: "Deploy to Cloud Run"
     name: "gcr.io/cloud-builders/gcloud:latest"
     args:
       - beta
       - run
       - deploy
       - ${_SERVICE_NAME}
-      - --image=${_AR_REPO_URL}/filesystem-e2e-test:${BUILD_ID}
+      - --source=.
       - --execution-environment=gen2
       - --vpc-connector=${_CONNECTOR}
       - --update-env-vars=FILESTORE_IP_ADDRESS=${_FILESTORE_IP_ADDRESS},FILE_SHARE_NAME=${_FILESHARE}
       - --region=${_DEPLOY_REGION}
       - --no-allow-unauthenticated
 
 substitutions:
+  _SERVICE_NAME: filesystem
   _DEPLOY_REGION: us-central1
   _FILESHARE: vol1
-  _AR_REPO_URL: us-central1-docker.pkg.dev/${PROJECT_ID}/cloud-run-source-deploy
-
-options:
-  dynamic_substitutions: true
+  _CONNECTOR: my-run-connector
+  _FILESTORE_IP_ADDRESS: 0.0.0.0
diff --git a/run/filesystem/e2e_test.py b/run/filesystem/e2e_test.py
@@ -27,6 +27,7 @@
 # Unique suffix to create distinct service names
 SUFFIX = uuid.uuid4().hex
 PROJECT = os.environ['GOOGLE_CLOUD_PROJECT']
+region = 'us-central1'
 
 
 @pytest.fixture
@@ -58,10 +59,23 @@ def deployed_service():
             'services',
             'delete',
             service_name,
-            '--region=us-central1',
+            f'--region={region}',
             '--platform=managed',
             '--quiet',
-            "--async",
+            '--project',
+            PROJECT,
+        ]
+    )
+
+    subprocess.check_call(
+        [
+            'gcloud',
+            'artifacts',
+            'docker',
+            'images',
+            'delete',
+            f'{region}-docker.pkg.dev/{PROJECT}/cloud-run-source-deploy/{service_name}',
+            '--quiet',
             '--project',
             PROJECT,
         ]
@@ -79,7 +93,7 @@ def service_url_auth_token(deployed_service):
                 'services',
                 'describe',
                 deployed_service,
-                '--region=us-central1',
+                f'--region={region}',
                 '--platform=managed',
                 '--format=value(status.url)',
                 '--project',
