From ac33ce1a2ef27418e680aa2d81ef44bbc0a290e6 Mon Sep 17 00:00:00 2001
From: Justin Dalrymple <jdalrymple@users.noreply.github.com>
Date: Tue, 30 Jan 2024 22:23:21 -0500
Subject: [PATCH] Set timeout on e2e test setup job to avoid long CI builds
 (#3529)

* Set job timeout to avoid long Jobs eating CI minutes
* Removing install `need` for setup stage
---
 .gitlab-ci.yml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2bcc94b7..ab2e7f97 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -131,8 +131,7 @@ format:
 test:unit:setup:
   stage: setup
   image: alpine/curl
-  needs:
-    - install
+  needs: []
   script:
     - mkdir -p tmp/codeclimate
     - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./tmp/codeclimate/cc-test-reporter
@@ -145,8 +144,8 @@ test:unit:setup:
 test:live:setup:
   stage: setup
   image: gcr.io/google.com/cloudsdktool/cloud-sdk:alpine
-  needs:
-    - install
+  needs: []
+  timeout: 15m
   rules:
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
       when: on_success
@@ -195,7 +194,7 @@ test:live:setup:
     - echo "GITLAB_URL=${GITLAB_URL}" >> intergration.env
     - echo "GITLAB_PERSONAL_ACCESS_TOKEN=${GITLAB_PERSONAL_ACCESS_TOKEN}" >> intergration.env
     - echo "Waiting for service to start"
-    - sleep 210
+    - sleep 240
     - attempt=1
     - |
       while [[ "$(curl --fail --silent -X GET "$GITLAB_URL/-/readiness?all=1" --insecure | jq -r '.master_check[0].status')" != "ok" ]]; do