From 4b8ba8cf3adc9a6d390d5c2ba87767f946bc938a Mon Sep 17 00:00:00 2001
From: Sean Hammond <seanh@users.noreply.github.com>
Date: Wed, 24 Jan 2024 14:23:08 +0000
Subject: [PATCH] Remove QA from GitHub Actions workflows

---
 .../includes/.github/workflows/environments.json  |  9 +--------
 .github/workflows/deploy.yml                      | 15 +--------------
 .github/workflows/redeploy.yml                    | 15 ---------------
 3 files changed, 2 insertions(+), 37 deletions(-)

diff --git a/.cookiecutter/includes/.github/workflows/environments.json b/.cookiecutter/includes/.github/workflows/environments.json
index 5c20c10f..646d4799 100644
--- a/.cookiecutter/includes/.github/workflows/environments.json
+++ b/.cookiecutter/includes/.github/workflows/environments.json
@@ -1,11 +1,4 @@
 {
-  "qa": {
-    "github_environment_name": "QA",
-    "github_environment_url": "https://qa.hyp.is/FiqzonGfEe2o-AfEssZXnw/en.wikipedia.org/wiki/Wikipedia:Terminal_Event_Management_Policy",
-    "aws_region": "us-west-1",
-    "elasticbeanstalk_application": "bouncer",
-    "elasticbeanstalk_environment": "qa"
-  },
   "staging": {
     "github_environment_name": "Staging",
     "github_environment_url": "https://staging.hyp.is/FiqzonGfEe2o-AfEssZXnw/en.wikipedia.org/wiki/Wikipedia:Terminal_Event_Management_Policy",
@@ -14,7 +7,7 @@
     "elasticbeanstalk_environment": "staging"
   },
   "production": {
-    "needs": ["qa"],
+    "needs": ["staging"],
     "github_environment_name": "Production",
     "github_environment_url": "https://hyp.is/FiqzonGfEe2o-AfEssZXnw/en.wikipedia.org/wiki/Wikipedia:Terminal_Event_Management_Policy",
     "aws_region": "us-west-1",
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 2e211532..60054359 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -24,19 +24,6 @@ jobs:
     with:
       Application: ${{ github.event.repository.name }}
     secrets: inherit
-  qa:
-    name: QA
-    needs: [docker_hub]
-    uses: hypothesis/workflows/.github/workflows/deploy.yml@main
-    with:
-      operation: deploy
-      github_environment_name: QA
-      github_environment_url: https://qa.hyp.is/FiqzonGfEe2o-AfEssZXnw/en.wikipedia.org/wiki/Wikipedia:Terminal_Event_Management_Policy
-      aws_region: us-west-1
-      elasticbeanstalk_application: bouncer
-      elasticbeanstalk_environment: qa
-      docker_tag: ${{ needs.Docker_Hub.outputs.docker_tag }}
-    secrets: inherit
   staging:
     name: Staging
     needs: [docker_hub]
@@ -52,7 +39,7 @@ jobs:
     secrets: inherit
   production:
     name: Production
-    needs: [docker_hub, qa]
+    needs: [docker_hub, staging]
     uses: hypothesis/workflows/.github/workflows/deploy.yml@main
     with:
       operation: deploy
diff --git a/.github/workflows/redeploy.yml b/.github/workflows/redeploy.yml
index cb28b10d..98a30913 100644
--- a/.github/workflows/redeploy.yml
+++ b/.github/workflows/redeploy.yml
@@ -5,9 +5,6 @@ concurrency:
 on:
   workflow_dispatch:
     inputs:
-      qa:
-        type: boolean
-        description: Redeploy QA
       staging:
         type: boolean
         description: Redeploy Staging
@@ -15,18 +12,6 @@ on:
         type: boolean
         description: Redeploy Production
 jobs:
-  qa:
-    name: QA
-    if: inputs.qa
-    uses: hypothesis/workflows/.github/workflows/deploy.yml@main
-    with:
-      operation: redeploy
-      github_environment_name: QA
-      github_environment_url: https://qa.hyp.is/FiqzonGfEe2o-AfEssZXnw/en.wikipedia.org/wiki/Wikipedia:Terminal_Event_Management_Policy
-      aws_region: us-west-1
-      elasticbeanstalk_application: bouncer
-      elasticbeanstalk_environment: qa
-    secrets: inherit
   staging:
     name: Staging
     if: inputs.staging