Skip to content

Commit ef2d423

Browse files
pmacikpmacik
authored
feat(release-tests): Add jobs for 3 replica HA of Max Concurrency and Orchestrator scenarios (#311)
Signed-off-by: Pavel Macík <pavel.macik@gmail.com>
1 parent 6d26c23 commit ef2d423

File tree

2 files changed

+75
-2
lines changed

2 files changed

+75
-2
lines changed

‎ci-scripts/gather-artifacts-from-ci.sh‎

Lines changed: 43 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ SCRIPT_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
99
ARTIFACT_DIR=$(python3 -c 'import os, sys; print(os.path.realpath(sys.argv[1]))' "${ARTIFACT_DIR:-.artifacts}")
1010
mkdir -p "${ARTIFACT_DIR}"
1111

12-
PRS="${PRS:-279 280 281 282 283 284 285 286 287 288 289 290 292 293 294 295}"
12+
PRS="${PRS:-279 280 281 282 283 284 285 286 287 288 289 290 292 293 294 295 307 308 309 310}"
1313
BRANCHES="${BRANCHES:-rhdh-v1.7.x main}"
1414

1515
CURRENT_VERSION=${CURRENT_VERSION:-1.8-164}
@@ -47,6 +47,7 @@ gather_artifacts_from_ci() {
4747

4848
output="${ARTIFACT_DIR}/.artifacts.${SCALABILITY_SCENARIO}"
4949

50+
rm -rvf "${output}"
5051
mkdir -p "${output}"
5152
echo "$RHDH_VERSION" >"$output/rhdh-version.txt"
5253
echo "$PR_NUMBER" >"$output/pr-number.txt"
@@ -135,7 +136,7 @@ Duration"
135136

136137
generate_rhdh_perf_charts_for_scenarios() {
137138
# Comparing current version with previous version for each scenario
138-
for s in max_concurrency max_concurrency_with_orchestrator max_concurrency_ha_2 rbac rbac_groups rbac_nested orchestrator orchestrator_ha_2; do
139+
for s in max_concurrency max_concurrency_with_orchestrator max_concurrency_ha_2 max_concurrency_ha_3 rbac rbac_groups rbac_nested orchestrator orchestrator_ha_2 orchestrator_ha_3 ; do
139140

140141
export CURRENT_DIR="${ARTIFACT_DIR}/.artifacts.test-${CURRENT_BASE_VERSION}-${s}-${CURRENT_BASE_VERSION}"
141142
export PREVIOUS_DIR="${ARTIFACT_DIR}/.artifacts.test-${CURRENT_BASE_VERSION}-${s}-${PREVIOUS_BASE_VERSION}"
@@ -172,6 +173,26 @@ generate_rhdh_perf_charts_for_scenarios() {
172173
PREVIOUS_VERSION="1 Replica<br>($(cat "${PREVIOUS_DIR}/rhdh-version.txt"))" || true
173174
generate_rhdh_perf_charts || true
174175

176+
export CURRENT_DIR="${ARTIFACT_DIR}/.artifacts.test-${CURRENT_BASE_VERSION}-orchestrator_ha_3-${CURRENT_BASE_VERSION}"
177+
export PREVIOUS_DIR="${ARTIFACT_DIR}/.artifacts.test-${CURRENT_BASE_VERSION}-orchestrator_ha_2-${CURRENT_BASE_VERSION}"
178+
179+
export SCENARIO=orchestrator_ha_3_vs_2
180+
export OUTPUT_DIR="${ARTIFACT_DIR}/.backstage-perf-charts/${SCENARIO}"
181+
export CURRENT_VERSION PREVIOUS_VERSION
182+
CURRENT_VERSION="3 Replicas<br>($(cat "${CURRENT_DIR}/rhdh-version.txt"))" || true
183+
PREVIOUS_VERSION="2 Replicas<br>($(cat "${PREVIOUS_DIR}/rhdh-version.txt"))" || true
184+
generate_rhdh_perf_charts || true
185+
186+
export CURRENT_DIR="${ARTIFACT_DIR}/.artifacts.test-${CURRENT_BASE_VERSION}-orchestrator_ha_3-${CURRENT_BASE_VERSION}"
187+
export PREVIOUS_DIR="${ARTIFACT_DIR}/.artifacts.test-${CURRENT_BASE_VERSION}-orchestrator-${CURRENT_BASE_VERSION}"
188+
189+
export SCENARIO=orchestrator_ha_3_vs_1
190+
export OUTPUT_DIR="${ARTIFACT_DIR}/.backstage-perf-charts/${SCENARIO}"
191+
export CURRENT_VERSION PREVIOUS_VERSION
192+
CURRENT_VERSION="3 Replicas<br>($(cat "${CURRENT_DIR}/rhdh-version.txt"))" || true
193+
PREVIOUS_VERSION="1 Replica<br>($(cat "${PREVIOUS_DIR}/rhdh-version.txt"))" || true
194+
generate_rhdh_perf_charts || true
195+
175196
# Comparing Max Concurrency HA
176197
export CURRENT_DIR="${ARTIFACT_DIR}/.artifacts.test-${CURRENT_BASE_VERSION}-max_concurrency_ha_2-${CURRENT_BASE_VERSION}"
177198
export PREVIOUS_DIR="${ARTIFACT_DIR}/.artifacts.test-${CURRENT_BASE_VERSION}-max_concurrency-${CURRENT_BASE_VERSION}"
@@ -182,6 +203,26 @@ generate_rhdh_perf_charts_for_scenarios() {
182203
CURRENT_VERSION="2 Replicas<br>($(cat "${CURRENT_DIR}/rhdh-version.txt"))" || true
183204
PREVIOUS_VERSION="1 Replica<br>($(cat "${PREVIOUS_DIR}/rhdh-version.txt"))" || true
184205
generate_rhdh_perf_charts || true
206+
207+
export CURRENT_DIR="${ARTIFACT_DIR}/.artifacts.test-${CURRENT_BASE_VERSION}-max_concurrency_ha_3-${CURRENT_BASE_VERSION}"
208+
export PREVIOUS_DIR="${ARTIFACT_DIR}/.artifacts.test-${CURRENT_BASE_VERSION}-max_concurrency_ha_2-${CURRENT_BASE_VERSION}"
209+
210+
export SCENARIO=max_concurrency_ha_3_vs_2
211+
export OUTPUT_DIR="${ARTIFACT_DIR}/.backstage-perf-charts/${SCENARIO}"
212+
export CURRENT_VERSION PREVIOUS_VERSION
213+
CURRENT_VERSION="3 Replicas<br>($(cat "${CURRENT_DIR}/rhdh-version.txt"))" || true
214+
PREVIOUS_VERSION="2 Replicas<br>($(cat "${PREVIOUS_DIR}/rhdh-version.txt"))" || true
215+
generate_rhdh_perf_charts || true
216+
217+
export CURRENT_DIR="${ARTIFACT_DIR}/.artifacts.test-${CURRENT_BASE_VERSION}-max_concurrency_ha_3-${CURRENT_BASE_VERSION}"
218+
export PREVIOUS_DIR="${ARTIFACT_DIR}/.artifacts.test-${CURRENT_BASE_VERSION}-max_concurrency-${CURRENT_BASE_VERSION}"
219+
220+
export SCENARIO=max_concurrency_ha_3_vs_1
221+
export OUTPUT_DIR="${ARTIFACT_DIR}/.backstage-perf-charts/${SCENARIO}"
222+
export CURRENT_VERSION PREVIOUS_VERSION
223+
CURRENT_VERSION="3 Replicas<br>($(cat "${CURRENT_DIR}/rhdh-version.txt"))" || true
224+
PREVIOUS_VERSION="1 Replica<br>($(cat "${PREVIOUS_DIR}/rhdh-version.txt"))" || true
225+
generate_rhdh_perf_charts || true
185226
}
186227

187228
all() {

‎ci-scripts/release-tests.sh‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -322,6 +322,31 @@ function orchestrator_ha_2_test() {
322322
_test "$name" "$nick" "$ticket"
323323
}
324324

325+
function orchestrator_ha_3_test() {
326+
name="Orchestrator test HA (3 nodes)"
327+
nick="orchestrator_ha_3"
328+
ticket="$1" # Jira story
329+
330+
export DURATION="10m"
331+
export RHDH_LOG_LEVEL=debug
332+
export SCALE_WORKERS=100
333+
export RBAC_POLICY=all_groups_admin
334+
export ENABLE_ORCHESTRATOR=true
335+
export SCENARIO=orchestrator
336+
export ALWAYS_CLEANUP=true
337+
338+
export SCALE_ACTIVE_USERS_SPAWN_RATES="1:1 10:2 25:5 50:10 100:20 150:30 200:40 250:50 300:60 400:80 500:100"
339+
export SCALE_BS_USERS_GROUPS="1000:250"
340+
export SCALE_RBAC_POLICY_SIZE="1000"
341+
export SCALE_CATALOG_SIZES="2500:2500"
342+
export SCALE_REPLICAS="3:3"
343+
export SCALE_DB_STORAGES="2Gi"
344+
export SCALE_CPU_REQUESTS_LIMITS=":"
345+
export SCALE_MEMORY_REQUESTS_LIMITS=":"
346+
347+
_test "$name" "$nick" "$ticket"
348+
}
349+
325350
function rbac_test() {
326351
name="RBAC test"
327352
nick="rbac"
@@ -420,6 +445,9 @@ run_orchestrator_test() {
420445
run_orchestrator_ha_2_test() {
421446
orchestrator_ha_2_test "RHIDP-9708"
422447
}
448+
run_orchestrator_ha_3_test() {
449+
orchestrator_ha_3_test "RHIDP-9708"
450+
}
423451
run_rbac_test() {
424452
rbac_test "RHIDP-9165"
425453
}
@@ -460,6 +488,9 @@ for test_id in "${test_ids[@]}"; do
460488
"orchestrator_ha_2")
461489
run_orchestrator_ha_2_test
462490
;;
491+
"orchestrator_ha_3")
492+
run_orchestrator_ha_3_test
493+
;;
463494
"rbac")
464495
run_rbac_test
465496
;;
@@ -479,6 +510,7 @@ for test_id in "${test_ids[@]}"; do
479510
# run_max_concurrency_with_orchestrator_test
480511
# run_orchestrator_test
481512
# run_orchestrator_ha_2_test
513+
# run_orchestrator_ha_3_test
482514
# run_rbac_test
483515
# run_rbac_groups_test
484516
# run_rbac_nested_test

0 commit comments

Comments
 (0)