diff --git a/.github/workflows/performance.yaml b/.github/workflows/performance.yaml
index 103f81409e8..f4c30477116 100644
--- a/.github/workflows/performance.yaml
+++ b/.github/workflows/performance.yaml
@@ -41,11 +41,6 @@ on:
required: false
type: string
default: '900'
- 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: string
- default: '20'
row_count:
description: "Optional (default 1000) number of rows in the cohort file."
required: false
@@ -56,6 +51,11 @@ on:
required: true
type: string
default: 'nurse.perftest@example.com'
+ BaseURL:
+ description: "Optional (default qa.mavistesting.com) URL"
+ required: true
+ type: string
+ default: 'qa.mavistesting.com'
jobs:
nurse_journey_performance_test:
@@ -131,6 +131,7 @@ jobs:
-j $generate_cohort_output_dir/jmeter.log \
-JAuthToken=${{secrets.HTTP_AUTH_TOKEN_FOR_TESTS}} \
-JURN=${{inputs.URN}} \
+ -JBaseURL=${{inputs.BaseURL}} \
-JRowCount=${{inputs.row_count}}
- name: Run file import for new file
@@ -143,6 +144,7 @@ jobs:
-j $import_output_dir/jmeter.log \
-JAuthToken=${{secrets.HTTP_AUTH_TOKEN_FOR_TESTS}} \
-JUser=${{inputs.user}} \
+ -JBaseURL=${{inputs.BaseURL}} \
-JInputFile="cohortnew.csv"
- name: Run Consent Journey
@@ -163,6 +165,7 @@ jobs:
-JRampUp=60 \
-JDuration=${{inputs.duration}} \
-JUser=${{inputs.user}} \
+ -JBaseURL=${{inputs.BaseURL}} \
-JURN=${{inputs.URN}}
- name: Upload consent journey JMeter output
@@ -188,10 +191,10 @@ jobs:
-JAuthToken=${{secrets.HTTP_AUTH_TOKEN_FOR_TESTS}} \
-JLoops=-1 \
-JThreads=${{inputs.threads}} \
- -JVaccinationLoop=${{inputs.vaccination_loop}} \
-JRampUp=${{inputs.ramp_up}} \
-JDuration=${{inputs.duration}} \
-JUser=${{inputs.user}} \
+ -JBaseURL=${{inputs.BaseURL}} \
-JURN=${{inputs.URN}}
- name: Upload nurse journey JMeter output
diff --git a/performance-tests/STS/consent-journey.jmx b/performance-tests/STS/consent-journey.jmx
index 216b86c61da..bde145ad73e 100644
--- a/performance-tests/STS/consent-journey.jmx
+++ b/performance-tests/STS/consent-journey.jmx
@@ -81,13 +81,18 @@
5
=
+
+ BaseURL
+ ${__P(BaseURL,qa.mavistesting.com)}
+ =
+
User ${__P(User, nurse.perftest@example.com)}
URN ${__P(URN, 137390)}
- qa.mavistesting.com
+ ${BaseURL}
https
@@ -1144,7 +1149,7 @@ log.info("Total Consents found: " + consentCount.toString());
-
+
Test Plan
Test Plan
@@ -1153,7 +1158,7 @@ log.info("Total Consents found: " + consentCount.toString());
-
+
${ConsentThreads}
${RampUp}
${Duration}
@@ -1439,7 +1444,7 @@ vars.get("VaccineCount_td_ipv",props.get("VaccineCount_td_ipv&quo
-
+
groovy
diff --git a/performance-tests/STS/generate-cohort.jmx b/performance-tests/STS/generate-cohort.jmx
index d9691006ee5..8085aca91bb 100644
--- a/performance-tests/STS/generate-cohort.jmx
+++ b/performance-tests/STS/generate-cohort.jmx
@@ -171,12 +171,17 @@ writer.close();
URN
- ${__P(URN, 100006)}
+ ${__P(URN, 108657)}
=
RowCount
- ${__P(RowCount,100)}
+ ${__P(RowCount,300)}
+ =
+
+
+ BaseURL
+ ${__P(BaseURL,qa.mavistesting.com)}
=
diff --git a/performance-tests/STS/nurse-journey.jmx b/performance-tests/STS/nurse-journey.jmx
index fe63449c4a3..2c3d3166bfe 100644
--- a/performance-tests/STS/nurse-journey.jmx
+++ b/performance-tests/STS/nurse-journey.jmx
@@ -118,13 +118,13 @@
Loops
- ${__P(Loops, 5)}
+ ${__P(Loops, 1)}
=
How many loops total (must be multiple times higher than vaccinationloop)
Threads
- ${__P(Threads, 4)}
+ ${__P(Threads, 1)}
=
@@ -146,18 +146,23 @@
User
- ${__P(User, nurse.perftest@example.com)}
+ ${__P(User, nurse.perf2test@example.com)}
+ =
+
+
+ BaseURL
+ ${__P(BaseURL,qa.mavistesting.com)}
=
User ${__P(User, nurse.perftest@example.com)}
-
+
true
true
6
- qa.mavistesting.com
+ ${BaseURL}
https
@@ -219,7 +224,7 @@
-
+
${Threads}
${RampUp}
${Duration}
@@ -241,7 +246,7 @@
-
+
false
saveConfig
@@ -278,7 +283,7 @@
-
+
9191
true
C:\apache-jmeter-5.6.3\bin
@@ -910,14 +915,14 @@ while(vars.get("vaccination_" + i)){
false
-
+
groovy
true
//Get the current thread number
Threadnum=ctx.getThreadNum().toInteger()
-//Threadnum=3 // Use to override a vaccine if needed
+//Threadnum=2 // Use to override a vaccine if needed
//Divide threads equally between the four programmes, each nurse stays with the programme (might bias it towards Flu at some point)
@@ -1090,7 +1095,7 @@ log.info("for thread " + Threadnum.toString() + " & VaccineNa
1
-
+
groovy
@@ -1154,7 +1159,7 @@ log.info("for thread " + Threadnum.toString() + " & VaccineNa
- sessions/${SessionId}/register?q=${CHILD_FIRST_NAME}+${CHILD_LAST_NAME}®ister_status=&vaccination_status=none_yet&%5Byear_groups%5D%5B%5D=&date_of_birth_day=&date_of_birth_month=&date_of_birth_year=&archived=0&missing_nhs_number=0
+ sessions/${SessionId}/register?q=${CHILD_FIRST_NAME}+${CHILD_LAST_NAME}&%5Bprogramme_types%5D%5B%5D=®ister_status=&vaccination_status=&%5Byear_groups%5D%5B%5D=&date_of_birth_day=&date_of_birth_month=&date_of_birth_year=&archived=0&missing_nhs_number=0
true
GET
true
@@ -1209,6 +1214,12 @@ log.info("for thread " + Threadnum.toString() + " & VaccineNa
+
+ false
+ true
+ false
+
+
${__jexl3("${PatientName_matchNr}" == "0")}
false
@@ -1437,7 +1448,7 @@ for(loop=1;loop<=PatientCount;loop++){
-
+
false
true
false
diff --git a/performance-tests/STS/upload-cohort-data.jmx b/performance-tests/STS/upload-cohort-data.jmx
index 6e9cfc8e727..e5c5892835a 100644
--- a/performance-tests/STS/upload-cohort-data.jmx
+++ b/performance-tests/STS/upload-cohort-data.jmx
@@ -43,7 +43,7 @@
-
+
BaseDirectory
@@ -85,6 +85,11 @@
${__P(User, nurse.jackie@example.org)}
=
+
+ BaseURL
+ ${__P(BaseURL,qa.mavistesting.com)}
+ =
+
@@ -133,8 +138,8 @@
-
- qa.mavistesting.com
+
+ ${BaseURL}
https
@@ -643,7 +648,7 @@ ${__FileToString(${BaseDirectory}${FileName},,)}
groovy
-
+
false
CohortImportId
<a href="\/cohort-imports\/(.*?)"
@@ -779,7 +784,7 @@ ${__FileToString(${BaseDirectory}${FileName},,)}
-
+
false
saveConfig