@@ -41,7 +41,7 @@ IPA_TESTS_CLIENTS="${!IPA_TESTS_CLIENTS_VARNAME:-0}"
41
41
IPA_TESTS_REPLICAS_VARNAME=" IPA_TESTS_REPLICAS_${PROJECT_ID} "
42
42
IPA_TESTS_REPLICAS=" ${! IPA_TESTS_REPLICAS_VARNAME:- 0} "
43
43
44
- IPA_TESTS_CONTROLLER=" ${PROJECT_ID} _master_1 "
44
+ IPA_TESTS_CONTROLLER=" ${PROJECT_ID} -master-1 "
45
45
IPA_TESTS_LOGSDIR=" ${IPA_TESTS_REPO_PATH} /ipa_envs/${IPA_TESTS_ENV_NAME} /${CI_RUNNER_LOGS_DIR} "
46
46
47
47
# path to azure scripts inside container
@@ -108,14 +108,14 @@ IPA_INSTALLED_PKGS_DIR="${project_dir}/installed_packages"
108
108
BASH_CMD=" /bin/bash --noprofile --norc"
109
109
110
110
function containers() {
111
- local _containers=" ${PROJECT_ID} _master_1 "
111
+ local _containers=" ${PROJECT_ID} -master-1 "
112
112
# build list of replicas
113
113
for i in $( seq 1 1 " $IPA_TESTS_REPLICAS " ) ; do
114
- _containers+=" ${PROJECT_ID} _replica_ ${i} "
114
+ _containers+=" ${PROJECT_ID} -replica- ${i} "
115
115
done
116
116
# build list of clients
117
117
for i in $( seq 1 1 " $IPA_TESTS_CLIENTS " ) ; do
118
- _containers+=" ${PROJECT_ID} _client_ ${i} "
118
+ _containers+=" ${PROJECT_ID} -client- ${i} "
119
119
done
120
120
printf " $_containers "
121
121
}
@@ -158,7 +158,7 @@ IPA_TESTS_CLIENT_MEMSWAP_LIMIT="$IPA_TESTS_CLIENT_MEMSWAP_LIMIT" \
158
158
IPA_TESTS_CLIENT_MEM_RESERVATION=" $IPA_TESTS_CLIENT_MEM_RESERVATION " \
159
159
IPA_TESTS_SERVER_MEM_RESERVATION=" $IPA_TESTS_SERVER_MEM_RESERVATION " \
160
160
IPA_TESTS_REPLICA_MEM_RESERVATION=" $IPA_TESTS_REPLICA_MEM_RESERVATION " \
161
- docker- compose -p " $PROJECT_ID " up \
161
+ docker compose -p " $PROJECT_ID " up \
162
162
--scale replica=" $IPA_TESTS_REPLICAS " \
163
163
--scale client=" $IPA_TESTS_CLIENTS " \
164
164
--force-recreate --remove-orphans -d
@@ -279,7 +279,7 @@ IPA_TESTS_CLIENT_MEMSWAP_LIMIT="$IPA_TESTS_CLIENT_MEMSWAP_LIMIT" \
279
279
IPA_TESTS_CLIENT_MEM_RESERVATION=" $IPA_TESTS_CLIENT_MEM_RESERVATION " \
280
280
IPA_TESTS_SERVER_MEM_RESERVATION=" $IPA_TESTS_SERVER_MEM_RESERVATION " \
281
281
IPA_TESTS_REPLICA_MEM_RESERVATION=" $IPA_TESTS_REPLICA_MEM_RESERVATION " \
282
- docker- compose -p " $PROJECT_ID " down
282
+ docker compose -p " $PROJECT_ID " down
283
283
popd
284
284
285
285
exit $tests_result
0 commit comments