feat: Fixing Stage GH action

konflux-ci · Jun 6, 2024 · cf52f6b · cf52f6b
1 parent 1f114f8
commit cf52f6b
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 22 deletions.
diff --git a/.github/workflows/loadtest.yaml b/.github/workflows/loadtest.yaml
@@ -3,12 +3,12 @@ name: CI Stage Load Test
 on:
   workflow_dispatch:
     inputs:
-      users:
+      concurrency:
         type: string
-        description: Number of Users
-      threads:
+        description: Number of concurrent user journey threads
+      journey_repeats:
         type: string
-        description: Number of threads
+        description: Number of sequential user journey repetitions
 
 jobs:
   load_test:
@@ -37,10 +37,8 @@ jobs:
     - name: Run Load Test
       working-directory: ./tests/load-tests
       env:
-        USERS_PER_THREAD: ${{ github.event.inputs.users }}
-        THREADS: ${{ github.event.inputs.threads }}
-        PUSHGATEWAY_URL: ${{ secrets.PUSHGATEWAY_URL }}
-        DISABLE_METRICS: ${{ secrets.DISABLE_METRICS }}
+        CONCURRENCY: ${{ github.event.inputs.concurrency }}
+        JOURNEY_REPEATS: ${{ github.event.inputs.journey_repeats }}
       run: ./run-stage.sh
 
     - name: Collect results

diff --git a/tests/load-tests/run-stage.sh b/tests/load-tests/run-stage.sh
@@ -1,18 +1,23 @@
 go run loadtest.go \
+    --applications-count "${APPLICATIONS_COUNT:-1}" \
+    --build-pipeline-selector-bundle "${BUILD_PIPELINE_SELECTOR_BUNDLE:-}" \
     --component-repo "${COMPONENT_REPO:-https://github.com/devfile-samples/devfile-sample-code-with-quarkus}" \
-    --username "$USER_PREFIX" \
-    --users "${USERS_PER_THREAD:-2}" \
+    --component-repo-revision "${COMPONENT_REPO_REVISION:-main}" \
+    --components-count "${COMPONENTS_COUNT:-1}" \
+    --concurrency "${CONCURRENCY:-1}" \
+    --journey-duration "${JOURNEY_DURATION:-1h}" \
+    --journey-repeats "${JOURNEY_REPEATS:-1}" \
+    --log-trace \
+    --multiarch-workflow="${MULTIARCH_WORKFLOW:-false}" \
+    --output-dir "${OUTPUT_DIR:-.}" \
+    --pipeline-request-configure-pac="${PIPELINE_REQUEST_CONFIGURE_PAC:-false}" \
+    --pipeline-skip-initial-checks="${PIPELINE_SKIP_INITIAL_CHECKS:-true}" \
+    --purge="${PURGE:-true}" \
+    --quay-repo "${QUAY_REPO:-redhat-user-workloads-stage}" \
     --test-scenario-git-url "${TEST_SCENARIO_GIT_URL:-https://github.com/konflux-ci/integration-examples.git}" \
-    --test-scenario-revision "${TEST_SCENARIO_REVISION:-main}" \
     --test-scenario-path-in-repo "${TEST_SCENARIO_PATH_IN_REPO:-pipelines/integration_resolver_pipeline_pass.yaml}" \
-    -s \
-    -w="${WAIT_PIPELINES:-true}" \
-    -i="${WAIT_INTEGRATION_TESTS:-true}" \
-    -d="${WAIT_DEPLOYMENTS:-true}" \
-    -l \
-    -o "${OUTPUT_DIR:-.}" \
-    -t "${THREADS:-2}" \
-    --disable-metrics="${DISABLE_METRICS:-false}" \
-    --pushgateway-url "${PUSHGATEWAY_URL:-rhtapqe.com}" \
-    --enable-progress-bars="${ENABLE_PROGRESS_BARS:-false}" \
-    --pipeline-skip-initial-checks="${PIPELINE_SKIP_INITIAL_CHECKS:-true}"
+    --test-scenario-revision "${TEST_SCENARIO_REVISION:-main}" \
+    --username "$USER_PREFIX" \
+    --waitintegrationtestspipelines="${WAIT_INTEGRATION_TESTS:-true}" \
+    --waitpipelines="${WAIT_PIPELINES:-true}" \
+    --stage