Rename workflow and add sidekiq

TheOneFromNorway · TheOneFromNorway · commit 0e725b9b46d8 · 2025-12-04T10:07:05.000Z
- Rename workflow to fit scope better
- Add sidekiq container to allow tests to pass
diff --git a/.github/workflows/end-to-end-tests.yml b/.github/workflows/end-to-end-tests.yml
@@ -2,6 +2,18 @@ name: Regression test run
 
 on:
   workflow_call:
+    inputs:
+      github_ref:
+        description: The git reference for deploying containerized mavis application
+        type: string
+        required: false
+    secrets:
+      HTTP_AUTH_TOKEN_FOR_TESTS:
+        description: HTTP Basic Auth token for the environment under test
+        required: true
+      MAVIS_TESTING_REPO_ACCESS_TOKEN:
+        description: Access token for the manage-vaccinations-in-schools-testing repository
+        required: true
 
 permissions: { }
 
@@ -37,7 +49,10 @@ jobs:
       id-token: write
     steps:
       - name: Checkout code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
+        with:
+          ref: ${{ inputs.github_ref || github.ref }}
+          repository: nhsuk/manage-vaccinations-in-schools
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v5
         with:
@@ -71,24 +86,31 @@ jobs:
         with:
           role-to-assume: arn:aws:iam::393416225559:role/GitHubAssuranceTestRole
           aws-region: eu-west-2
-      - name: Render task definition
-        id: render-task-definition
+      - name: Render task definition 1
+        id: render-task-definition-1
         uses: aws-actions/amazon-ecs-render-task-definition@v1
         with:
           task-definition-family: "assurance-testing-regression-task-definition-template"
-          container-name: "mavis-regression"
+          container-name: "mavis-regression-web"
+          image: "393416225559.dkr.ecr.eu-west-2.amazonaws.com/mavis/regression:${{ github.sha }}"
+      - name: Render task definition 2
+        id: render-task-definition-2
+        uses: aws-actions/amazon-ecs-render-task-definition@v1
+        with:
+          task-definition: ${{ steps.render-task-definition-1.outputs.task-definition }}
+          container-name: "mavis-regression-sidekiq"
           image: "393416225559.dkr.ecr.eu-west-2.amazonaws.com/mavis/regression:${{ github.sha }}"
       - name: Prepare deployment
         id: prepare-deployment
         run: |
           file_path="assurance-testing-regression-task-definition.json"
           family_name="assurance-testing-regression-task-definition"
-          echo "$(jq --arg f "$family_name" '.family = $f' "${{ steps.render-task-definition.outputs.task-definition }}")" > "$file_path"
+          echo "$(jq --arg f "$family_name" '.family = $f' "${{ steps.render-task-definition-2.outputs.task-definition }}")" > "$file_path"
           cat "$file_path" #TODO: Debugging, remove later
-          
+
           subnet_id=$(aws ec2 describe-subnets --filters Name=tag:Name,Values=assurance-testing-subnet --query 'Subnets[0].SubnetId' --output text)
           security_group_id=$(aws ec2 describe-security-groups --filters Name=group-name,Values=assurance-testing-regression-sg --query 'SecurityGroups[0].GroupId' --output text)
-          
+
           echo "run-task-subnets=$subnet_id" >> $GITHUB_OUTPUT
           echo "run-task-security-groups=$security_group_id" >> $GITHUB_OUTPUT
       - name: Deploy task definition
@@ -176,9 +198,12 @@ jobs:
         run: |
           TASK_ARN=$(echo '${{ needs.launch-dockerized-devimage.outputs.run_task_arn }}' | jq -r '.[0]')
           TASK_ID=$(sed 's:^.*/::' <<< $TASK_ARN)
-          CLOUDWATCH_URL="https://eu-west-2.console.aws.amazon.com/cloudwatch/home?region=eu-west-2#logsV2:log-groups/log-group/assurance-testing-ecs/log-events/assurance-testing-logs\$252Fmavis-regression\$252F${TASK_ID}\$3Fstart\$3D$(date +%s)000\$26end\$3D$(date -d '+30 minutes' +%s)000"
+          WEB_CLOUDWATCH_URL="https://eu-west-2.console.aws.amazon.com/cloudwatch/home?region=eu-west-2#logsV2:log-groups/log-group/assurance-testing-ecs/log-events/assurance-testing-logs\$252Fmavis-regression-web\$252F${TASK_ID}\$3Fstart\$3D$(date +%s)000\$26end\$3D$(date -d '+30 minutes' +%s)000"
+          SIDEKIQ_CLOUDWATCH_URL="https://eu-west-2.console.aws.amazon.com/cloudwatch/home?region=eu-west-2#logsV2:log-groups/log-group/assurance-testing-ecs/log-events/assurance-testing-logs\$252Fmavis-regression-sidekiq\$252F${TASK_ID}\$3Fstart\$3D$(date +%s)000\$26end\$3D$(date -d '+30 minutes' +%s)000"
           echo "**Task ID:** $TASK_ID" >> $GITHUB_STEP_SUMMARY
-          echo "**Container Logs:** $CLOUDWATCH_URL" >> $GITHUB_STEP_SUMMARY
+          echo "**Container Logs:** " >> $GITHUB_STEP_SUMMARY
+          echo "  * WEB logs: $WEB_CLOUDWATCH_URL" >> $GITHUB_STEP_SUMMARY
+          echo "  * SIDEKIQ logs: $SIDEKIQ_CLOUDWATCH_URL" >> $GITHUB_STEP_SUMMARY
           NETWORK_INTERFACE=$(aws ecs describe-tasks \
             --cluster assurance-testing \
             --tasks "$TASK_ARN" \
@@ -190,30 +215,39 @@ jobs:
           echo "container_ip=$CONTAINER_IP" >> $GITHUB_OUTPUT
           echo "task_arn=$TASK_ARN" >> $GITHUB_OUTPUT
           echo "Started task: $TASK_ARN"
-          echo "Logs for server: ${CLOUDWATCH_URL}"
+          echo "Logs for server: [web](${WEB_CLOUDWATCH_URL}) and [sidekiq](${SIDEKIQ_CLOUDWATCH_URL})"
+  find-correct-test-branch:
+    needs: [wait-for-task-stability]
+    if: ${{ !cancelled() && needs.wait-for-task-stability.result == 'success'}}
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+    outputs:
+      test_branch: ${{ steps.check-branch.outputs.test_branch }}
+    steps:
+      - name: Check if branch exists
+        id: check-branch
+        run: |
+          if git ls-remote --exit-code --heads https://github.com/NHSDigital/manage-vaccinations-in-schools-testing.git "$BRANCH_TO_CHECK" > /dev/null 2>&1; then
+            echo "test_branch=$BRANCH_TO_CHECK" >> $GITHUB_OUTPUT
+          else
+            echo "test_branch=main" >> $GITHUB_OUTPUT
+          fi
+        env:
+          BRANCH_TO_CHECK: ${{ github.head_ref }}
   call-functional-tests:
-    needs: [launch-dockerized-devimage, wait-for-task-stability]
+    needs: [launch-dockerized-devimage, wait-for-task-stability, find-correct-test-branch]
     if: ${{ !cancelled() && needs.launch-dockerized-devimage.result == 'success' && needs.wait-for-task-stability.result == 'success'}}
-    uses: NHSDigital/manage-vaccinations-in-schools-testing/.github/workflows/functional_selected_device.yaml@make-workflow-callable #TODO: Change once this is in main
+    uses: NHSDigital/manage-vaccinations-in-schools-testing/.github/workflows/functional_selected_device.yaml@containerized_regression_tests_for_PRs #TODO: Change once this is in main
     permissions:
       contents: write
     with:
-      tests: ''
-      device: 'Desktop Chrome'
-      programmes: 'FLU,HPV,MENACWY,MMR,TD_IPV'
-      endpoint: "http://${{ needs.wait-for-task-stability.outputs.container_ip }}:4000"
-      screenshot_all_steps: 'false'
-      enable_reruns: 'true'
-      test_workers: '4'
-      set_feature_flags: 'false'
-      additional_feature_flags: ''
+      cross_service_tests: false
+      github_ref: ${{ needs.find-correct-test-branch.outputs.test_branch }}
+      endpoint: 'http://${{ needs.wait-for-task-stability.outputs.container_ip }}:4000'
     secrets:
       HTTP_AUTH_TOKEN_FOR_TESTS: ${{ secrets.HTTP_AUTH_TOKEN_FOR_TESTS }}
-    #   IMMS_API_KEY: ${{ secrets.IMMS_API_KEY }}
-    #   IMMS_API_KID: ${{ secrets.IMMS_API_KID }}
-    #   IMMS_API_PEM: ${{ secrets.IMMS_API_PEM }}
-    #   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    #
+      MAVIS_TESTING_REPO_ACCESS_TOKEN: ${{ secrets.MAVIS_TESTING_REPO_ACCESS_TOKEN }}
   stop-docker-environment:
     needs: [call-functional-tests, launch-dockerized-devimage, wait-for-task-stability]
     if: ${{ always() && needs.launch-dockerized-devimage.result != 'skipped'}}
@@ -227,4 +261,4 @@ jobs:
           role-to-assume: arn:aws:iam::393416225559:role/GitHubAssuranceTestRole
           aws-region: eu-west-2
       - name: Stop dockerized dev image
-        run: aws ecs stop-task --cluster assurance-testing --task ${{ needs.wait-for-task-stability.outputs.task_arn }}
+        run: aws ecs stop-task --cluster assurance-testing --task ${{ needs.wait-for-task-stability.outputs.task_arn }}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -79,20 +79,23 @@ jobs:
           bin/rails parallel:load_schema
       - name: Run tests
         run: bin/rails parallel:spec
-  regression:
-    name: Regression Tests
+  end-to-end-tests:
+    name: End to End tests
     needs: run-test-suites-check
     if: needs.run-test-suites-check.outputs.run-test-suites == 'true'
     permissions:
       id-token: write
       contents: write
-    uses: ./.github/workflows/regression-test-run.yml
+    uses: ./.github/workflows/end-to-end-tests.yml
+    secrets:
+      HTTP_AUTH_TOKEN_FOR_TESTS: ${{ secrets.HTTP_AUTH_TOKEN_FOR_TESTS }}
+      MAVIS_TESTING_REPO_ACCESS_TOKEN: ${{ secrets.MAVIS_TESTING_REPO_ACCESS_TOKEN }}
 
   seeds:
     name: Seeds
     runs-on: ubuntu-latest
-    needs: pre-rails-tests
-    if: needs.pre-rails-tests.outputs.run-rails-tests == 'true'
+    needs: run-test-suites-check
+    if: needs.run-test-suites-check.outputs.run-test-suites == 'true'
     services:
       postgres:
         image: postgres:17.2
diff --git a/terraform/assurance_testing/ecs.tf b/terraform/assurance_testing/ecs.tf
@@ -51,7 +51,7 @@ resource "aws_ecs_task_definition" "regression" {
   task_role_arn            = aws_iam_role.ecs_task_role.arn
   container_definitions = jsonencode([
     {
-      name      = "mavis-regression"
+      name      = "mavis-regression-web"
       image     = "CHANGE_ME"
       essential = true
       environment = [
@@ -74,6 +74,10 @@ resource "aws_ecs_task_definition" "regression" {
         {
           name  = "SKIP_TEST_DATABASE"
           value = "true"
+        },
+        {
+          name  = "SERVER_TYPE"
+          value = "web"
         }
       ]
       portMappings = [
@@ -88,7 +92,7 @@ resource "aws_ecs_task_definition" "regression" {
         options = {
           awslogs-group         = aws_cloudwatch_log_group.this.name
           awslogs-region        = "eu-west-2"
-          awslogs-stream-prefix = "${var.identifier}-logs"
+          awslogs-stream-prefix = "${var.identifier}-web-logs"
         }
       }
       healthCheck = {
@@ -103,6 +107,60 @@ resource "aws_ecs_task_definition" "regression" {
         condition     = "HEALTHY"
       }]
     },
+    {
+      name      = "mavis-regression-sidekiq"
+      image     = "CHANGE_ME"
+      essential = false
+      environment = [
+        {
+          name  = "DATABASE_HOST"
+          value = "localhost"
+        },
+        {
+          name  = "DATABASE_USER"
+          value = "postgres"
+        },
+        {
+          name  = "DATABASE_PASSWORD"
+          value = "postgres"
+        },
+        {
+          name  = "RAILS_MASTER_KEY"
+          value = "intentionally-insecure-dev-key00"
+        },
+        {
+          name  = "SKIP_TEST_DATABASE"
+          value = "true"
+        },
+        {
+          name  = "SERVER_TYPE"
+          value = "sidekiq"
+        },
+        {
+          name  = "HTTP_PORT"
+          value = "5000"
+        }
+      ]
+      logConfiguration = {
+        logDriver = "awslogs"
+        options = {
+          awslogs-group         = aws_cloudwatch_log_group.this.name
+          awslogs-region        = "eu-west-2"
+          awslogs-stream-prefix = "${var.identifier}-logs"
+        }
+      }
+      healthCheck = {
+        command     = ["CMD-SHELL", "grep -q '[s]idekiq' /proc/*/cmdline 2>/dev/null || exit 1"]
+        interval    = 30
+        timeout     = 5
+        retries     = 3
+        startPeriod = 90
+      }
+      dependsOn = [{
+        containerName = "mavis-regression-db"
+        condition     = "HEALTHY"
+      }]
+    },
     {
       name      = "mavis-regression-db"
       image     = "${data.aws_caller_identity.current.account_id}.dkr.ecr.eu-west-2.amazonaws.com/mavis/dev/postgres_db:latest"
