fix: Properly adding RESULTS_DIR as env var

bcgov · Aug 23, 2024 · 3aa7dc6 · 3aa7dc6
1 parent 533a7c2
commit 3aa7dc6
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 10 deletions.
diff --git a/.github/workflows/loadtest.yml b/.github/workflows/loadtest.yml
@@ -5,6 +5,11 @@ on:
   workflow_dispatch:
     inputs:
       ### Required
+      num_threads:
+        description: 'Number of concurrent threads (USERS) for each test in sequence'
+        default: 200
+        required: true
+        type: integer
       dops_api_url:
         description: 'The url endpoint for the dops'
         default: onroutebc-test-dops.apps.silver.devops.gov.bc.ca
@@ -43,10 +48,11 @@ jobs:
             --loglevel INFO 
             --jmeterlogconf=log.conf
             -JBEARER_TOKEN=${{inputs.bearer_token}}
-            -JDOPS_API_URL=${{inputs.dops_api_url}}
+            -JNUM_THREADS=${{inputs.num_threads}}
             -JFRONTEND_API_URL=${{inputs.frontend_api_url}}
+            -JDOPS_API_URL=${{inputs.dops_api_url}}
             -JVEHICLES_API_URL=${{inputs.vehicles_api_url}}
-            -JRESULTS_DIR=loadtest/results
+            -JRESULTS_DIR=loadtests/results
 
       - uses: actions/[email protected]
         with:

diff --git a/loadtests/orbc_load_test_plan_dops.jmx b/loadtests/orbc_load_test_plan_dops.jmx
@@ -80,6 +80,11 @@
       <hashTree/>
       <Arguments guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
         <collectionProp name="Arguments.arguments">
+          <elementProp name="NUM_THREADS" elementType="Argument">
+            <stringProp name="Argument.name">NUM_THREADS</stringProp>
+            <stringProp name="Argument.value">200</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
           <elementProp name="FRONTEND_API_URL" elementType="Argument">
             <stringProp name="Argument.name">FRONTEND_API_URL</stringProp>
             <stringProp name="Argument.value">onroutebc-test-frontend.apps.silver.devops.gov.bc.ca</stringProp>
@@ -114,7 +119,7 @@
           <boolProp name="LoopController.continue_forever">false</boolProp>
           <stringProp name="LoopController.loops">1</stringProp>
         </elementProp>
-        <stringProp name="ThreadGroup.num_threads">1000</stringProp>
+        <stringProp name="ThreadGroup.num_threads">${NUM_THREADS}</stringProp>
         <stringProp name="ThreadGroup.ramp_time">${__P(rampup,300)}</stringProp>
         <longProp name="ThreadGroup.start_time">1365261073000</longProp>
         <longProp name="ThreadGroup.end_time">1365261073000</longProp>

diff --git a/loadtests/orbc_load_test_plan_frontend.jmx b/loadtests/orbc_load_test_plan_frontend.jmx
@@ -80,6 +80,11 @@
       <hashTree/>
       <Arguments guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
         <collectionProp name="Arguments.arguments">
+          <elementProp name="NUM_THREADS" elementType="Argument">
+            <stringProp name="Argument.name">NUM_THREADS</stringProp>
+            <stringProp name="Argument.value">200</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
           <elementProp name="FRONTEND_API_URL" elementType="Argument">
             <stringProp name="Argument.name">FRONTEND_API_URL</stringProp>
             <stringProp name="Argument.value">onroutebc-test-frontend.apps.silver.devops.gov.bc.ca/</stringProp>
@@ -124,7 +129,7 @@
           <boolProp name="LoopController.continue_forever">false</boolProp>
           <stringProp name="LoopController.loops">1</stringProp>
         </elementProp>
-        <stringProp name="ThreadGroup.num_threads">100</stringProp>
+        <stringProp name="ThreadGroup.num_threads">${NUM_THREADS}</stringProp>
         <stringProp name="ThreadGroup.ramp_time">${__P(rampup,300)}</stringProp>
         <longProp name="ThreadGroup.start_time">1365261073000</longProp>
         <longProp name="ThreadGroup.end_time">1365261073000</longProp>
@@ -1501,7 +1506,7 @@
           <boolProp name="LoopController.continue_forever">false</boolProp>
           <stringProp name="LoopController.loops">1</stringProp>
         </elementProp>
-        <stringProp name="ThreadGroup.num_threads">100</stringProp>
+        <stringProp name="ThreadGroup.num_threads">${NUM_THREADS}</stringProp>
         <stringProp name="ThreadGroup.ramp_time">${__P(rampup,300)}</stringProp>
         <longProp name="ThreadGroup.start_time">1365261073000</longProp>
         <longProp name="ThreadGroup.end_time">1365261073000</longProp>

diff --git a/loadtests/orbc_load_test_plan_vehicles.jmx b/loadtests/orbc_load_test_plan_vehicles.jmx
@@ -80,8 +80,8 @@
       <hashTree/>
       <Arguments guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
         <collectionProp name="Arguments.arguments">
-          <elementProp name="USERS" elementType="Argument">
-            <stringProp name="Argument.name">USERS</stringProp>
+          <elementProp name="NUM_THREADS" elementType="Argument">
+            <stringProp name="Argument.name">NUM_THREADS</stringProp>
             <stringProp name="Argument.value">200</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
@@ -609,7 +609,7 @@
           <boolProp name="LoopController.continue_forever">false</boolProp>
           <stringProp name="LoopController.loops">1</stringProp>
         </elementProp>
-        <stringProp name="ThreadGroup.num_threads">${USERS}</stringProp>
+        <stringProp name="ThreadGroup.num_threads">${NUM_THREADS}</stringProp>
         <stringProp name="ThreadGroup.ramp_time">${__P(rampup,300)}</stringProp>
         <longProp name="ThreadGroup.start_time">1365261073000</longProp>
         <longProp name="ThreadGroup.end_time">1365261073000</longProp>
@@ -736,7 +736,7 @@
           <boolProp name="LoopController.continue_forever">false</boolProp>
           <stringProp name="LoopController.loops">1</stringProp>
         </elementProp>
-        <stringProp name="ThreadGroup.num_threads">${USERS}</stringProp>
+        <stringProp name="ThreadGroup.num_threads">${NUM_THREADS}</stringProp>
         <stringProp name="ThreadGroup.ramp_time">${__P(rampup,300)}</stringProp>
         <longProp name="ThreadGroup.start_time">1365261073000</longProp>
         <longProp name="ThreadGroup.end_time">1365261073000</longProp>
@@ -948,7 +948,7 @@
           <boolProp name="LoopController.continue_forever">false</boolProp>
           <stringProp name="LoopController.loops">1</stringProp>
         </elementProp>
-        <stringProp name="ThreadGroup.num_threads">${USERS}</stringProp>
+        <stringProp name="ThreadGroup.num_threads">${NUM_THREADS}</stringProp>
         <stringProp name="ThreadGroup.ramp_time">${__P(rampup,300)}</stringProp>
         <longProp name="ThreadGroup.start_time">1365261073000</longProp>
         <longProp name="ThreadGroup.end_time">1365261073000</longProp>