Merge pull request #249 from NHSDigital/create_cohort

Create cohort

Author: simonnorris1

.github/workflows/performance-e2e.yaml

@@ -17,26 +17,30 @@ on:
         required: true
         type: boolean
         default: 'true'
-      input_file:
-        description: "Require: Input file name used for all steps."
+      URN:
+        description: "Required: what URN to run the test against."
         required: true
         type: string
       duration:
         description: "Optional (default 3600) Duration of nurse journey test, in seconds. This will include ramp-up."
         required: false
-        type: number
+        type: string
       threads:
         description: "Optional (default 70) Threads to run. Equivalent to the number of nurses using the system."
         required: false
-        type: number
+        type: string
       ramp_up:
         description: "Optional (default 900) Ramp-up time in seconds. Threads will be gradually started up over this time."
         required: false
-        type: number
+        type: string
       vaccination_loop:
         description: "Optional (default 20) Vaccination loop. The number of vaccinations each nurse will perform before logging and back in again."
         required: false
-        type: number
+        type: string
+      row_count:
+        description: "Optional (default 1000) number of rows in the cohort file."
+        required: false
+        type: string
 
 
 # env:
@@ -87,6 +91,19 @@ jobs:
         id: timestamp
         run: echo "timestamp=$(date '+%Y%m%d%H%M%S')" >> $GITHUB_ENV
 
+      - name: Create new cohort file
+        if: inputs.runDataPrep == true
+        run: |
+          mkdir -p generate-cohort-output
+          generate_cohort_output_dir=generate-cohort-output
+          jmeter/bin/jmeter -n -t performance-tests/E2E/generate-cohort.jmx \
+              -l $generate_cohort_output_dir/samples.jtl \
+              -j $generate_cohort_output_dir/jmeter.log \
+              -e -o $generate_cohort_output_dir/upload-report \
+              -JAuthToken=${{secrets.HTTP_AUTH_TOKEN_FOR_TESTS}} \
+              -JURN=${{inputs.URN}} \
+              -JRowCount=${{inputs.row_count}}
+
       - name: Run file import for new file
         if: inputs.runDataPrep == true
         run: |
@@ -97,7 +114,7 @@ jobs:
               -j $import_output_dir/jmeter.log \
               -e -o $import_output_dir/upload-report \
               -JAuthToken=${{secrets.HTTP_AUTH_TOKEN_FOR_TESTS}} \
-              -JInputFile=${{inputs.input_file}}
+              -JInputFile="cohortnew.csv"
 
       - name: Run Consent Journey for imported records
         if: inputs.runDataPrep == true
@@ -109,7 +126,7 @@ jobs:
               -j $consent_output_dir/jmeter.log \
               -e -o $consent_output_dir/consent-report \
               -JAuthToken=${{secrets.HTTP_AUTH_TOKEN_FOR_TESTS}} \
-              -JInputFile=${{inputs.input_file}}
+              -JInputFile="cohortnew.csv"
 
       - name: Run nurse journey JMeter test
         if: inputs.runNurse == true
@@ -125,7 +142,7 @@ jobs:
               -JThreads=${{inputs.threads}} \
               -JRampUp=${{inputs.ramp_up}} \
               -JVaccinationLoop=${{inputs.vaccination_loop}} \
-              -JInputFile=${{inputs.input_file}}
+              -JInputFile="cohortnew.csv"
 
       - name: Upload consent journey JMeter output
         if: inputs.runDataPrep == true

.github/workflows/performance.yaml

@@ -1,4 +1,4 @@
-name: Performance tests
+name: Performance
 
 on:
   push:
@@ -7,32 +7,45 @@ on:
 
   workflow_dispatch:
     inputs:
-      session_slug:
-        description: "Session slug - for a session in the QA environment. This session MUST HAVE A SESSION DATE FOR TODAY."
+      testToRun:
+        description: "Test to run"
+        type: choice
+        options:
+        - consent-journey
+        - nurse-journey
+      URN:
+        description: "Required: what URN to run the test against."
         required: true
         type: string
       duration:
-        description: "Duration of test, in seconds. This will include ramp-up."
+        description: "Optional (default 3600) Duration of selected test in seconds. This will include ramp-up."
         required: false
         type: number
       threads:
-        description: "Threads to run. Equivalent to the number of nurses using the system."
+        description: "Optional (default 70) Threads to run."
         required: false
         type: number
       ramp_up:
-        description: "Ramp-up time in seconds. Threads will be gradually started up over this time."
+        description: "Optional (default 900) Ramp-up time in seconds. Threads will be gradually started up over this time."
         required: false
         type: number
       vaccination_loop:
-        description: "Vaccination loop. The number of vaccinations each nurse will perform before logging and back in again."
+        description: "Optional (default 20) Vaccination loop (nurse journey only). The number of vaccinations each nurse will perform before logging and back in again."
         required: false
         type: number
+      row_count:
+        description: "Optional (default 1000) number of rows in the cohort file."
+        required: false
+        type: string
+
 
 # env:
 #   JMETER_PLUGIN_INSTALL_LIST: "jpgc-udp,jpgc-graphs-basic,jpgc-dummy,bzm-random-csv"
 
+# Added run-name information so it's easier to see what was run
+run-name: Test ${{inputs.testToRun}} run with ${{inputs.threads}} threads for ${{inputs.duration}} seconds and ${{inputs.ramp_up}} ramp up
 jobs:
-  nurse_journey_performance_test:
+  performance_test:
     runs-on: ubuntu-latest
 
     if: ${{ github.event_name == 'workflow_dispatch' }}
@@ -56,6 +69,7 @@ jobs:
           curl -LsS --output jmeter/lib/ext/jmeter-plugins-manager-${{ env.jmeter_plugins_manager_version  }}.jar https://jmeter-plugins.org/get/
           java -cp jmeter/lib/ext/jmeter-plugins-manager-${{ env.jmeter_plugins_manager_version }}.jar org.jmeterplugins.repository.PluginManagerCMDInstaller
           chmod +x jmeter/bin/PluginsManagerCMD.sh
+          sed -i '/<Logger name="org.apache.jmeter.junit" level="debug" \/>/a \    <Logger name="org.apache.jmeter.protocol.http.sampler.HTTPSamplerBase" level="info" additivity="false"\/>' jmeter/bin/log4j2.xml
 
       - name: Install JMeter plugins
         if: env.jmeter_plugins != ''
@@ -75,24 +89,84 @@ jobs:
         id: timestamp
         run: echo "timestamp=$(date '+%Y%m%d%H%M%S')" >> $GITHUB_ENV
 
-      - name: Run JMeter test
+      - name: Create new cohort file
+        run: |
+          mkdir -p generate-cohort-output
+          generate_cohort_output_dir=generate-cohort-output
+          jmeter/bin/jmeter -n -t performance-tests/E2E/generate-cohort.jmx \
+              -l $generate_cohort_output_dir/samples.jtl \
+              -j $generate_cohort_output_dir/jmeter.log \
+              -e -o $generate_cohort_output_dir/upload-report \
+              -JAuthToken=${{secrets.HTTP_AUTH_TOKEN_FOR_TESTS}} \
+              -JURN=${{inputs.URN}} \
+              -JRowCount=${{inputs.row_count}}
+
+      - name: Run file import for new file
         run: |
-          mkdir -p output
-          output_dir=output
-          jmeter/bin/jmeter -n -t performance-tests/nurse-journey.jmx \
-              -l $output_dir/samples.jtl \
-              -j $output_dir/jmeter.log \
-              -e -o $output_dir/report \
-              -JSessionSlug=${{inputs.session_slug}} \
+          mkdir -p import-output
+          import_output_dir=import-output
+          jmeter/bin/jmeter -n -t performance-tests/E2E/upload-cohort-data.jmx \
+              -l $import_output_dir/samples.jtl \
+              -j $import_output_dir/jmeter.log \
+              -e -o $import_output_dir/upload-report \
+              -JAuthToken=${{secrets.HTTP_AUTH_TOKEN_FOR_TESTS}} \
+              -JInputFile="cohortnew.csv"
+
+      - name: Run Standalone Consent Journey
+        if: inputs.testToRun == 'consent-journey'
+        run: |
+          mkdir -p consent-output
+          consent_output_dir=consent-output
+          jmeter/bin/jmeter -n -t performance-tests/E2E/consent-journey.jmx \
+              -l $consent_output_dir/samples.jtl \
+              -j $consent_output_dir/jmeter.log \
+              -e -o $consent_output_dir/consent-report \
               -JAuthToken=${{secrets.HTTP_AUTH_TOKEN_FOR_TESTS}} \
               -JDuration=${{inputs.duration}} \
               -JThreads=${{inputs.threads}} \
               -JRampUp=${{inputs.ramp_up}} \
-              -JVaccinationLoop=${{inputs.vaccination_loop}}
+              -JInputFile="cohortnew.csv"
+
+      - name: Run Consent Journey for data prep only
+        if: inputs.testToRun == 'nurse-journey'
+        run: |
+          mkdir -p consent-output
+          consent_output_dir=consent-output
+          jmeter/bin/jmeter -n -t performance-tests/E2E/consent-journey.jmx \
+              -l $consent_output_dir/samples.jtl \
+              -j $consent_output_dir/jmeter.log \
+              -e -o $consent_output_dir/consent-report \
+              -JAuthToken=${{secrets.HTTP_AUTH_TOKEN_FOR_TESTS}} \
+              -JInputFile="cohortnew.csv"
+
+      - name: Run nurse journey JMeter test
+        if: inputs.testToRun == 'nurse-journey'
+        run: |
+          mkdir -p nurse-output
+          nurse_output_dir=nurse-output
+          jmeter/bin/jmeter -n -t performance-tests/E2E/nurse-journey.jmx \
+              -l $nurse_output_dir/samples.jtl \
+              -j $nurse_output_dir/jmeter.log \
+              -e -o $nurse_output_dir/report \
+              -JAuthToken=${{secrets.HTTP_AUTH_TOKEN_FOR_TESTS}} \
+              -JDuration=${{inputs.duration}} \
+              -JThreads=${{inputs.threads}} \
+              -JRampUp=${{inputs.ramp_up}} \
+              -JVaccinationLoop=${{inputs.vaccination_loop}} \
+              -JInputFile="cohortnew.csv"
+
+      - name: Upload consent journey JMeter output
+        if: inputs.testToRun == 'consent-journey'
+        uses: actions/upload-artifact@v4
+        with:
+          name: jmeter-consent-journey-output-${{ env.timestamp }}
+          path: consent-output
+          if-no-files-found: warn
 
-      - name: Upload JMeter output
+      - name: Upload nurse journey JMeter output
+        if: inputs.testToRun == 'nurse-journey'
         uses: actions/upload-artifact@v4
         with:
           name: jmeter-nurse-journey-output-${{ env.timestamp }}
-          path: output
-          if-no-files-found: error
+          path: nurse-output
+          if-no-files-found: warn