refactor(RHIDH-9114): Keep db replica count for index directory

Signed-off-by: skestwal <[email protected]>

Author: skestwal

ci-scripts/scalability/collect-results.sh

@@ -43,6 +43,7 @@ for w in "${workers[@]}"; do
     for r_c in "${rhdh_replicas[@]}"; do
         IFS=":" read -ra tokens <<<"${r_c}"
         r="${tokens[0]}"
+        [[ "${#tokens[@]}" == 1 ]] && dbr="" || dbr="${tokens[1]}"
         for bu_bg in "${bs_users_groups[@]}"; do
             IFS=":" read -ra tokens <<<"${bu_bg}"
             bu="${tokens[0]}"                                        # backstage users
@@ -52,7 +53,7 @@ for w in "${workers[@]}"; do
                     for au_sr in "${active_users_spawn_rate[@]}"; do
                         IFS=":" read -ra tokens <<<"${au_sr}"
                         active_users=${tokens[0]}
-                        output="$ARTIFACT_DIR/scalability_c-${r}r-db_${s}-${bu}bu-${bg}bg-${rbs}rbs-${w}w-${active_users}u-${counter}.csv"
+                        output="$ARTIFACT_DIR/scalability_c-${r}r-${dbr}dbr-db_${s}-${bu}bu-${bg}bg-${rbs}rbs-${w}w-${active_users}u-${counter}.csv"
                         header="CatalogSize${csv_delim}Apis${csv_delim}Components${csv_delim}MaxActiveUsers${csv_delim}AverageRPS${csv_delim}MaxRPS${csv_delim}AverageRT${csv_delim}MaxRT${csv_delim}Failures${csv_delim}FailRate${csv_delim}DBStorageUsed${csv_delim}DBStorageAvailable${csv_delim}DBStorageCapacity"
                         for cr_cl in "${cpu_requests_limits[@]}"; do
                             IFS=":" read -ra tokens <<<"${cr_cl}"
@@ -67,7 +68,7 @@ for w in "${workers[@]}"; do
                                     IFS=":" read -ra tokens <<<"${a_c}"
                                     a="${tokens[0]}"                                       # apis
                                     [[ "${#tokens[@]}" == 1 ]] && c="" || c="${tokens[1]}" # components
-                                    index="${r}r-db_${s}-${bu}bu-${bg}bg-${rbs}rbs-${w}w-${cr}cr-${cl}cl-${mr}mr-${ml}ml-${a}a-${c}c"
+                                    index="${r}r-${dbr}dbr-db_${s}-${bu}bu-${bg}bg-${rbs}rbs-${w}w-${cr}cr-${cl}cl-${mr}mr-${ml}ml-${a}a-${c}c"
                                     iteration="${index}/test/${counter}/${active_users}u"
                                     (( counter += 1 ))
                                     echo "[$iteration] Looking for benchmark.json..."

ci-scripts/scalability/test-scalability.sh

@@ -130,7 +130,7 @@ for w in "${workers[@]}"; do
                                 export WORKERS=$w
                                 export API_COUNT=$a
                                 export COMPONENT_COUNT=$c
-                                index="${r}r-db_${s}-${bu}bu-${bg}bg-${rbs}rbs-${w}w-${cr}cr-${cl}cl-${mr}mr-${ml}ml-${a}a-${c}c"
+                                index="${r}r-${dbr}dbr-db_${s}-${bu}bu-${bg}bg-${rbs}rbs-${w}w-${cr}cr-${cl}cl-${mr}mr-${ml}ml-${a}a-${c}c"
                                 set +x
                                 oc login "$OPENSHIFT_API" -u "$OPENSHIFT_USERNAME" -p "$OPENSHIFT_PASSWORD" --insecure-skip-tls-verify=true
                                 make clean-local undeploy-rhdh