Fix: filesystem e2e flakiness

run/filesystem/cloudbuild.yaml

@@ -1,4 +1,4 @@
-# Copyright 2021 Google LLC
+# Copyright 2022 Google LLC
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -10,23 +10,31 @@
 # 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"
-    entrypoint: /bin/bash
     args:
-      - "-c"
-      - |
-        ./retry.sh "gcloud alpha run deploy ${_SERVICE_NAME} \
-          --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"
+      - beta
+      - run
+      - deploy
+      - ${_SERVICE_NAME}
+      - --image=${_AR_REPO_URL}/filesystem-e2e-test:${BUILD_ID}
+      - --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
-  _CONNECTOR: my-run-connector
-  _FILESTORE_IP_ADDRESS: 0.0.0.0
+  _AR_REPO_URL: us-central1-docker.pkg.dev/${PROJECT_ID}/cloud-run-source-deploy
+
+options:
+  dynamic_substitutions: true