Merge pull request #4815 from systeminit/brit/bug-635-run-e2e-tests-i…

…n-tool-prod-every-15min

Add second cron for running e2e tests against tools production, fix deployment so we cancel running e2e tests if a deploy is kicked off

.github/workflows/deploy-stack.yml

@@ -28,14 +28,15 @@ on:
         description: "version to deploy"
         default: "stable"
 
-# We want to ensure that in-progress cron runs against prod
-# are canceled when we do a deploy so they don't fail erroneously.
+# We only one one deploy happening at a time per environment, so if one is
+# in progress, we'll wait for it to finish before starting the
+# next one.
+# Note that this will also wait for E2E tests to finish, as per the crons workflows
 concurrency:
-  group: e2e-${{ inputs.environment }}
+  group: deploy-${{ inputs.environment }}
   cancel-in-progress: false
 
 jobs:
-
   invoke-and-check-cdn:
     uses: ./.github/workflows/invoke-and-check-invalidations.yml
     with:
@@ -45,9 +46,9 @@ jobs:
   set-service-versions:
     uses: ./.github/workflows/set-service-version.yml
     strategy:
-     fail-fast: false
-     matrix:
-      service: [ "pinga", "rebaser", "sdf", "veritech", "forklift" ]
+      fail-fast: false
+      matrix:
+        service: ["pinga", "rebaser", "sdf", "veritech", "forklift"]
     with:
       environment: ${{ inputs.environment }}
       service: ${{ matrix.service }}
@@ -76,9 +77,9 @@ jobs:
       - set-service-versions
       - set-maintenance-mode
     strategy:
-     fail-fast: false
-     matrix:
-       service: [ "pinga", "rebaser", "veritech", "forklift" ]
+      fail-fast: false
+      matrix:
+        service: ["pinga", "rebaser", "veritech", "forklift"]
     uses: ./.github/workflows/upgrade-service.yml
     with:
       environment: ${{ inputs.environment }}

.github/workflows/crons.yml → .github/workflows/prod-crons.yml

@@ -1,10 +1,11 @@
-name: Crons
+name: Production Crons
 
 on:
   schedule:
-    - cron: '*/15 * * * *'  # Runs every 15 minutes
+    - cron: "*/15 * * * *" # Runs every 15 minutes
 
 # We will wait until these tests finish before starting a deploy
+# We will also wait for a deploy to finish before starting to run tests
 concurrency:
   group: deploy-production
   cancel-in-progress: false

.github/workflows/tools-crons.yml

@@ -0,0 +1,23 @@
+name: Tools Crons
+
+on:
+  schedule:
+    - cron: "*/15 * * * *" # Runs every 15 minutes
+
+# We will wait until these tests finish before starting a deploy
+# We will also wait for a deploy to finish before starting to run tests
+concurrency:
+  group: deploy-tools
+  cancel-in-progress: false
+
+jobs:
+  e2e-validation:
+    uses: ./.github/workflows/e2e-validation.yml
+    with:
+      environment: tools
+    secrets: inherit
+  api-test:
+    uses: ./.github/workflows/run-api-test.yml
+    with:
+      environment: tools
+    secrets: inherit