diff --git a/ci-scripts/collect-results.sh b/ci-scripts/collect-results.sh index 93ccb51..fd80f70 100755 --- a/ci-scripts/collect-results.sh +++ b/ci-scripts/collect-results.sh @@ -75,6 +75,7 @@ try_gather_file "${TMP_DIR}/benchmark-scenario" try_gather_file "${TMP_DIR}/create_group.log" try_gather_file "${TMP_DIR}/create_user.log" try_gather_file "${TMP_DIR}/get_token.log" +try_gather_file "${TMP_DIR}/get_rhdh_token.log" try_gather_file load-test.log try_gather_file postgresql.log diff --git a/ci-scripts/rhdh-setup/create_resource.sh b/ci-scripts/rhdh-setup/create_resource.sh index 76c234c..0f3f21b 100755 --- a/ci-scripts/rhdh-setup/create_resource.sh +++ b/ci-scripts/rhdh-setup/create_resource.sh @@ -308,7 +308,7 @@ rhdh_token() { --data-urlencode "code=$code" \ --data-urlencode "session_state=$session_state" \ --data-urlencode "state=$state" \ - "$CODE_URL" | jq -r ".backstageIdentity" | jq -r ".expires_in_timestamp = $(date -d '30 minutes' +%s)") + "$CODE_URL" | tee -a $TMP_DIR/get_rhdh_token.log | jq -r ".backstageIdentity" | jq -r ".expires_in_timestamp = $(date -d '30 minutes' +%s)") echo "$ACCESS_TOKEN" } diff --git a/test.env b/test.env index 4826ef0..e8454c9 100644 --- a/test.env +++ b/test.env @@ -3,23 +3,23 @@ # To override system environment variables, uncomment the variables down bellow. It will be sourced by the ci-scripts. ## Scenario -# export SCENARIO=baseline-test +export SCENARIO=mvp # export HOST=http://localhost # export USERS=100 # export WORKERS=5 -# export DURATION=1m +export DURATION=10m # export SPAWN_RATE=20 -# export WAIT_FOR_SEARCH_INDEX=false +export WAIT_FOR_SEARCH_INDEX=false ## RHDH database population -# export PRE_LOAD_DB=true +export PRE_LOAD_DB=true # export BACKSTAGE_USER_COUNT=1 # export GROUP_COUNT=1 # export API_COUNT=1 # export COMPONENT_COUNT=1 -# export KEYCLOAK_USER_PASS=changeme -# export AUTH_PROVIDER=keycloak -# export POPULATION_CONCURRENCY=10 +export KEYCLOAK_USER_PASS=V1RKb2FHSnRaR3hpVjFWTENnPT0K +export AUTH_PROVIDER=keycloak +export POPULATION_CONCURRENCY=10 # export COMPONENT_SHARD_SIZE=500 ## RHDH installed via Helm @@ -49,10 +49,19 @@ # export RHDH_RESOURCES_CPU_LIMITS= # export RHDH_RESOURCES_MEMORY_REQUESTS= # export RHDH_RESOURCES_MEMORY_LIMITS= -# export RHDH_KEYCLOAK_REPLICAS=1 +export RHDH_KEYCLOAK_REPLICAS=2 ## Extras # export LOCUST_EXTRA_CMD=--debug=true # export ARTIFACT_DIR=.artifacts -# export ENABLE_RBAC=false +export ENABLE_RBAC=true # export ENABLE_PROFILING=false + +export SCALE_WORKERS=1 +export SCALE_ACTIVE_USERS_SPAWN_RATES="1:1" +export SCALE_BS_USERS_GROUPS="1:1 1:1000 1:2000 1:5000 1:6000 1:7000 1:8000 1:9000 1:10000" +export SCALE_CATALOG_SIZES="2500:2500" +export SCALE_REPLICAS="1" +export SCALE_DB_STORAGES="10Gi" +export SCALE_CPU_REQUESTS_LIMITS=":" +export SCALE_MEMORY_REQUESTS_LIMITS=":"