Remove QA from GitHub Actions workflows

hypothesis · Jan 25, 2024 · 0ac02c3 · 0ac02c3
1 parent a7d8076
commit 0ac02c3
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 80 deletions.
diff --git a/.cookiecutter/includes/.github/workflows/environments.json b/.cookiecutter/includes/.github/workflows/environments.json
@@ -1,18 +1,4 @@
 {
-  "qa": {
-    "github_environment_name": "QA",
-    "github_environment_url": "https://qa.hypothes.is/search",
-    "aws_region": "us-west-1",
-    "elasticbeanstalk_application": "h",
-    "elasticbeanstalk_environment": "qa"
-  },
-  "qa_websocket": {
-    "github_environment_name": "QA (WebSocket)",
-    "github_environment_url": "https://qa.hypothes.is/docs/help",
-    "aws_region": "us-west-1",
-    "elasticbeanstalk_application": "h-websocket",
-    "elasticbeanstalk_environment": "qa"
-  },
   "staging": {
     "github_environment_name": "Staging",
     "github_environment_url": "https://staging.hypothes.is/search",
@@ -28,23 +14,23 @@
     "elasticbeanstalk_environment": "staging"
   },
   "production": {
-    "needs": ["qa", "qa_websocket"],
+    "needs": ["staging", "staging_websocket"],
     "github_environment_name": "Production",
     "github_environment_url": "https://hypothes.is/search",
     "aws_region": "us-west-1",
     "elasticbeanstalk_application": "h",
     "elasticbeanstalk_environment": "prod"
   },
   "production_websocket": {
-    "needs": ["qa", "qa_websocket"],
+    "needs": ["staging", "staging_websocket"],
     "github_environment_name": "Production (WebSocket)",
     "github_environment_url": "https://hypothes.is/docs/help",
     "aws_region": "us-west-1",
     "elasticbeanstalk_application": "h-websocket",
     "elasticbeanstalk_environment": "prod"
   },
   "production_canada": {
-    "needs": ["qa", "qa_websocket"],
+    "needs": ["staging", "staging_websocket"],
     "github_environment_name": "Production (Canada)",
     "github_environment_url": "https://ca.hypothes.is/search",
     "aws_region": "ca-central-1",

diff --git a/.github/workflows/data_tasks.yml b/.github/workflows/data_tasks.yml
@@ -16,9 +16,9 @@ on:
         type: choice
         description: "The environment to target"
         required: true
-        default: 'qa'
+        default: 'staging'
         options:
-          - 'qa'
+          - 'staging'
           - 'prod'
       Region:
         type: choice

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -38,32 +38,6 @@ jobs:
     with:
       Application: hypothesis
     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.hypothes.is/search
-      aws_region: us-west-1
-      elasticbeanstalk_application: h
-      elasticbeanstalk_environment: qa
-      docker_tag: ${{ needs.Docker_Hub.outputs.docker_tag }}
-    secrets: inherit
-  qa_websocket:
-    name: QA (WebSocket)
-    needs: [docker_hub]
-    uses: hypothesis/workflows/.github/workflows/deploy.yml@main
-    with:
-      operation: deploy
-      github_environment_name: QA (WebSocket)
-      github_environment_url: https://qa.hypothes.is/docs/help
-      aws_region: us-west-1
-      elasticbeanstalk_application: h-websocket
-      elasticbeanstalk_environment: qa
-      docker_tag: ${{ needs.Docker_Hub.outputs.docker_tag }}
-    secrets: inherit
   staging:
     name: Staging
     needs: [docker_hub]
@@ -92,7 +66,7 @@ jobs:
     secrets: inherit
   production:
     name: Production
-    needs: [docker_hub, qa, qa_websocket]
+    needs: [docker_hub, staging, staging_websocket]
     uses: hypothesis/workflows/.github/workflows/deploy.yml@main
     with:
       operation: deploy
@@ -105,7 +79,7 @@ jobs:
     secrets: inherit
   production_websocket:
     name: Production (WebSocket)
-    needs: [docker_hub, qa, qa_websocket]
+    needs: [docker_hub, staging, staging_websocket]
     uses: hypothesis/workflows/.github/workflows/deploy.yml@main
     with:
       operation: deploy
@@ -118,7 +92,7 @@ jobs:
     secrets: inherit
   production_canada:
     name: Production (Canada)
-    needs: [docker_hub, qa, qa_websocket]
+    needs: [docker_hub, staging, staging_websocket]
     uses: hypothesis/workflows/.github/workflows/deploy.yml@main
     with:
       operation: deploy

diff --git a/.github/workflows/redeploy.yml b/.github/workflows/redeploy.yml
@@ -5,12 +5,6 @@ concurrency:
 on:
   workflow_dispatch:
     inputs:
-      qa:
-        type: boolean
-        description: Redeploy QA
-      qa_websocket:
-        type: boolean
-        description: Redeploy QA (WebSocket)
       staging:
         type: boolean
         description: Redeploy Staging
@@ -27,30 +21,6 @@ on:
         type: boolean
         description: Redeploy Production (Canada)
 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.hypothes.is/search
-      aws_region: us-west-1
-      elasticbeanstalk_application: h
-      elasticbeanstalk_environment: qa
-    secrets: inherit
-  qa_websocket:
-    name: QA (WebSocket)
-    if: inputs.qa_websocket
-    uses: hypothesis/workflows/.github/workflows/deploy.yml@main
-    with:
-      operation: redeploy
-      github_environment_name: QA (WebSocket)
-      github_environment_url: https://qa.hypothes.is/docs/help
-      aws_region: us-west-1
-      elasticbeanstalk_application: h-websocket
-      elasticbeanstalk_environment: qa
-    secrets: inherit
   staging:
     name: Staging
     if: inputs.staging

diff --git a/.github/workflows/tasks.yml b/.github/workflows/tasks.yml
@@ -20,9 +20,8 @@ on:
         type: choice
         description: "The environment to target"
         required: true
-        default: 'qa'
+        default: 'staging'
         options:
-          - 'qa'
           - 'staging'
           - 'prod'
       Timeout: