Collect test results

* Store them in an S3 bucket
* Collect and attach them to the GitHub workflow

Author: bogsi17

.github/workflows/performance.yaml

@@ -117,9 +117,14 @@ jobs:
     runs-on: ubuntu-latest
     permissions:
       id-token: write
+      contents: write
     timeout-minutes: 180
+    env:
+      RESULT_PATH: ${{ inputs.testToRun }}/${{ inputs.URN }}/${{ github.run_number }}
     steps:
       - uses: actions/checkout@v5
+      - name: Set timestamp
+        run: echo "timestamp=$(date '+%Y%m%d%H%M%S')" >> $GITHUB_ENV
       - name: Configure AWS credentials
         uses: aws-actions/configure-aws-credentials@v5
         with:
@@ -134,6 +139,7 @@ jobs:
           image: "393416225559.dkr.ecr.eu-west-2.amazonaws.com/performancetest:${{ github.sha }}"
           environment-variables: |
             TEST_TO_RUN=${{ inputs.testToRun }}
+            RESULT_PATH=${{ env.RESULT_PATH }}
             URN=${{ inputs.URN }}
             DURATION=${{ inputs.duration }}
             THREADS=${{ inputs.threads }}
@@ -154,16 +160,15 @@ jobs:
                                   --output text
                                 )
           echo "task_definition_arn=$task_definition_arn" >> $GITHUB_OUTPUT
-      - name: Run ECS Task
+      - name: Start performance test
         id: run-task
         run: |
           echo "Starting ECS task for ${{ inputs.testToRun }} test against URN: ${{ inputs.URN }}"
           
-          # Prepare network configuration
           subnet_id=$(aws ec2 describe-subnets --filters Name=tag:Name,Values=performancetest-subnet --query 'Subnets[0].SubnetId' --output text)
           security_group_id=$(aws ec2 describe-security-groups --filters Name=group-name,Values=performancetest-sg --query 'SecurityGroups[0].GroupId' --output text)
           
-          aws ecs run-task \
+          task_arn=$(aws ecs run-task \
             --cluster performancetest \
             --task-definition ${{ steps.register-task-definition.outputs.task_definition_arn }} \
             --launch-type FARGATE \
@@ -172,5 +177,64 @@ jobs:
               "containerOverrides": [{
                 "name": "performancetest-container"
               }]
-            }'
-          
+            }' \
+            --query 'tasks[0].taskArn' \
+            --output text)
+          
+          echo "task_arn=$task_arn" >> $GITHUB_OUTPUT
+          echo "Started task: $task_arn"
+      - name: Wait for performance test to complete
+        run: |
+          echo "Waiting for task to complete: ${{ steps.run-task.outputs.task_arn }}"
+          aws ecs wait tasks-stopped \
+            --cluster performancetest \
+            --tasks ${{ steps.run-task.outputs.task_arn }}
+          
+          task_status=$(aws ecs describe-tasks \
+            --cluster performancetest \
+            --tasks ${{ steps.run-task.outputs.task_arn }} \
+            --query 'tasks[0].lastStatus' \
+            --output text)
+          
+          exit_code=$(aws ecs describe-tasks \
+            --cluster performancetest \
+            --tasks ${{ steps.run-task.outputs.task_arn }} \
+            --query 'tasks[0].containers[0].exitCode' \
+            --output text)
+          
+          echo "Task final status: $task_status"
+          echo "Container exit code: $exit_code"
+          
+          if [ "$exit_code" != "0" ]; then
+            echo "ECS task failed with exit code: $exit_code"
+            exit 1
+          fi
+      - name: Collect test result
+        id: collect-results
+        run: |
+          echo "Downloading test results from S3"
+          S3_PATH="s3://performancetest-reports/${{ env.RESULT_PATH }}"          
+          aws s3 sync "${S3_PATH}" ./test-results --no-progress
+
+          if [ "${{ inputs.testToRun }}" == "consent-journey" ]; then
+            echo "REPORT_DIR=test-results/consent/report" >> $GITHUB_OUTPUT
+          elif [ "${{ inputs.testToRun }}" == "nurse-journey" ]; then
+            echo "REPORT_DIR=test-results/nurse/report" >> $GITHUB_OUTPUT
+          fi
+      - name: Publish report to GH Pages
+        uses: peaceiris/actions-gh-pages@v4
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_branch: gh-pages
+          publish_dir: ${{ steps.collect-results.outputs.REPORT_DIR }}
+          destination_dir: JMeter/${{ env.RESULT_PATH }}
+          keep_files: true
+      - name: Set Job Summary
+        run: |
+          echo "## Performance Test Results" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "- **Test Type:** ${{ inputs.testToRun }}" >> $GITHUB_STEP_SUMMARY
+          echo "- **URN:** ${{ inputs.URN }}" >> $GITHUB_STEP_SUMMARY
+          echo "- **Run Number:** ${{ github.run_number }}" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "📊 View Test Report: https://nhsdigital.github.io/manage-vaccinations-in-schools-testing/JMeter/${{ env.RESULT_PATH }}/" >> $GITHUB_STEP_SUMMARY

performance-tests/Dockerfile

@@ -7,7 +7,13 @@ ENV JMETER_VERSION=5.6.3 \
     JMETER_HOME=/opt/jmeter \
     PATH="/opt/jmeter/bin:${PATH}"
 
-RUN apt-get update && apt-get install -y curl tar parallel && rm -rf /var/lib/apt/lists/*
+RUN apt-get update && apt-get install -y curl tar parallel unzip && rm -rf /var/lib/apt/lists/*
+
+# Install AWS CLI v2 for S3 uploads
+RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" \
+    && unzip awscliv2.zip \
+    && ./aws/install \
+    && rm -rf awscliv2.zip aws
 
 WORKDIR /opt
 

performance-tests/entrypoint.sh

@@ -2,14 +2,11 @@
 set -e
 
 # Default values
-TEST_TO_RUN=${TEST_TO_RUN:-"consent-journey"}
-URN=${URN:-""}
 DURATION=${DURATION:-3600}
 THREADS=${THREADS:-70}
 RAMP_UP=${RAMP_UP:-900}
 VACCINATION_LOOP=${VACCINATION_LOOP:-20}
 ROW_COUNT=${ROW_COUNT:-1000}
-AUTH_TOKEN=${AUTH_TOKEN:-""}
 
 # Validate required parameters
 if [ -z "$URN" ]; then
@@ -22,8 +19,10 @@ if [ -z "$AUTH_TOKEN" ]; then
     exit 1
 fi
 
-# Set timestamp for output files
-TIMESTAMP=$(date '+%Y%m%d%H%M%S')
+if [ -z "$RESULT_PATH" ]; then
+    echo "Error: RESULT_PATH is required"
+    exit 1
+fi
 
 echo "==================================="
 echo "Starting Performance Test"
@@ -35,7 +34,7 @@ echo "Threads: $THREADS"
 echo "Ramp Up: $RAMP_UP seconds"
 echo "Vaccination Loop: $VACCINATION_LOOP"
 echo "Row Count: $ROW_COUNT"
-echo "Timestamp: $TIMESTAMP"
+echo "Result Path: $RESULT_PATH"
 echo "==================================="
 
 # Create output directories
@@ -130,9 +129,25 @@ if [ $TEST_EXIT_CODE -ne 0 ]; then
     exit 1
 fi
 
+# Upload results to S3
+echo "==================================="
+echo "Uploading results to S3"
+echo "==================================="
+
+S3_BUCKET="performancetest-reports"
+
+S3_PATH="s3://${S3_BUCKET}/${RESULT_PATH}"
+
+echo "Uploading to: ${S3_PATH}"
+
+if aws s3 sync /output "${S3_PATH}" --no-progress; then
+    echo "Successfully uploaded results to S3"
+    echo "S3 Location: ${S3_PATH}"
+else
+    echo "ERROR: Failed to upload results to S3"
+    exit 1
+fi
+
 echo "==================================="
 echo "Performance test completed successfully"
 echo "==================================="
-echo "Results are available in /output"
-ls -la /output/
-exit 0