From 8606348c020d5907e165ae9d0ac4ea695cb992fa Mon Sep 17 00:00:00 2001
From: Burak Yigit Kaya <byk@sentry.io>
Date: Wed, 20 Oct 2021 23:18:54 +0300
Subject: [PATCH] ci: Enable parallel tests again, increase timeouts (#1125)

---
 .github/workflows/test.yml | 1 -
 _integration-test/run.sh   | 4 ++--
 install/wrap-up.sh         | 1 +
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 0d3db0e..5890960 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -27,7 +27,6 @@ jobs:
     runs-on: ubuntu-20.04
     name: "integration test"
     strategy:
-      max-parallel: 1
       fail-fast: false
       matrix:
         include:
diff --git a/_integration-test/run.sh b/_integration-test/run.sh
index 67ec747..0e4547b 100755
--- a/_integration-test/run.sh
+++ b/_integration-test/run.sh
@@ -41,7 +41,7 @@ echo "${_group}Starting Sentry for tests ..."
 echo 'SENTRY_BEACON=False' >> $SENTRY_CONFIG_PY
 $dcr web createuser --superuser --email $TEST_USER --password $TEST_PASS || true
 $dc up -d
-printf "Waiting for Sentry to be up"; timeout 60 bash -c 'until $(curl -Isf -o /dev/null $SENTRY_TEST_HOST); do printf '.'; sleep 0.5; done'
+printf "Waiting for Sentry to be up"; timeout 90 bash -c 'until $(curl -Isf -o /dev/null $SENTRY_TEST_HOST); do printf '.'; sleep 0.5; done'
 echo ""
 echo "${_endgroup}"
 
@@ -99,7 +99,7 @@ EVENT_PATH="projects/sentry/internal/events/$TEST_EVENT_ID/"
 export -f sentry_api_request get_csrf_token
 export SENTRY_TEST_HOST COOKIE_FILE EVENT_PATH
 printf "Getting the test event back"
-timeout 30 bash -c 'until $(sentry_api_request "$EVENT_PATH" -Isf -X GET -o /dev/null); do printf '.'; sleep 0.5; done'
+timeout 60 bash -c 'until $(sentry_api_request "$EVENT_PATH" -Isf -X GET -o /dev/null); do printf '.'; sleep 0.5; done'
 echo " got it!";
 
 EVENT_RESPONSE=$(sentry_api_request "$EVENT_PATH")
diff --git a/install/wrap-up.sh b/install/wrap-up.sh
index 125e7e0..6f1128b 100644
--- a/install/wrap-up.sh
+++ b/install/wrap-up.sh
@@ -3,6 +3,7 @@ if [[ "$MINIMIZE_DOWNTIME" ]]; then
 
   # Start the whole setup, except nginx and relay.
   $dc up -d --remove-orphans $($dc config --services | grep -v -E '^(nginx|relay)$')
+  $dc restart relay
   $dc exec -T nginx nginx -s reload
 
   docker run --rm --network="${COMPOSE_PROJECT_NAME}_default" alpine ash \