From 2ddf3cab60593707ed216b94f24a71ed880b77a5 Mon Sep 17 00:00:00 2001
From: Ian Woodard <17186604+IanWoodard@users.noreply.github.com>
Date: Tue, 4 Jun 2024 10:18:25 -0700
Subject: [PATCH] fix(gocd): Updating canary checks to happen after the deploy
 goes out

---
 gocd/templates/pipelines/snuba.libsonnet | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/gocd/templates/pipelines/snuba.libsonnet b/gocd/templates/pipelines/snuba.libsonnet
index ae6a08cb28..f9e47c3f3c 100644
--- a/gocd/templates/pipelines/snuba.libsonnet
+++ b/gocd/templates/pipelines/snuba.libsonnet
@@ -128,22 +128,14 @@ local deploy_canary_stage(region) =
             'deploy-canary': {
               timeout: 1200,
               elastic_profile_id: 'snuba',
-              environment_variables: {
-                LABEL_SELECTOR: 'service=snuba,is_canary=true',
-              },
-              tasks: [
-                gocdtasks.script(importstr '../bash/deploy.sh'),
-              ],
-            },
-            health_check: {
               environment_variables: {
                 SENTRY_AUTH_TOKEN: '{{SECRET:[devinfra-sentryio][token]}}',
                 DATADOG_API_KEY: '{{SECRET:[devinfra][sentry_datadog_api_key]}}',
                 DATADOG_APP_KEY: '{{SECRET:[devinfra][sentry_datadog_app_key]}}',
                 LABEL_SELECTOR: 'service=snuba,is_canary=true',
               },
-              elastic_profile_id: 'snuba',
               tasks: [
+                gocdtasks.script(importstr '../bash/deploy.sh'),
                 gocdtasks.script(importstr '../bash/canary-ddog-health-check.sh'),
               ],
             },