Skip to content

Commit 7ecc35b

Browse files
ap: Migrate to docker compose V2
actions/runner-images#9557 > Docker Compose v1 will be removed from images on April, 1 https://docs.docker.com/compose/migrate/
1 parent 098e615 commit 7ecc35b

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

ipatests/azure/scripts/azure-run-tests.sh

+6-6
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ IPA_TESTS_CLIENTS="${!IPA_TESTS_CLIENTS_VARNAME:-0}"
4141
IPA_TESTS_REPLICAS_VARNAME="IPA_TESTS_REPLICAS_${PROJECT_ID}"
4242
IPA_TESTS_REPLICAS="${!IPA_TESTS_REPLICAS_VARNAME:-0}"
4343

44-
IPA_TESTS_CONTROLLER="${PROJECT_ID}_master_1"
44+
IPA_TESTS_CONTROLLER="${PROJECT_ID}-master-1"
4545
IPA_TESTS_LOGSDIR="${IPA_TESTS_REPO_PATH}/ipa_envs/${IPA_TESTS_ENV_NAME}/${CI_RUNNER_LOGS_DIR}"
4646

4747
# path to azure scripts inside container
@@ -108,14 +108,14 @@ IPA_INSTALLED_PKGS_DIR="${project_dir}/installed_packages"
108108
BASH_CMD="/bin/bash --noprofile --norc"
109109

110110
function containers() {
111-
local _containers="${PROJECT_ID}_master_1"
111+
local _containers="${PROJECT_ID}-master-1"
112112
# build list of replicas
113113
for i in $(seq 1 1 "$IPA_TESTS_REPLICAS"); do
114-
_containers+=" ${PROJECT_ID}_replica_${i}"
114+
_containers+=" ${PROJECT_ID}-replica-${i}"
115115
done
116116
# build list of clients
117117
for i in $(seq 1 1 "$IPA_TESTS_CLIENTS"); do
118-
_containers+=" ${PROJECT_ID}_client_${i}"
118+
_containers+=" ${PROJECT_ID}-client-${i}"
119119
done
120120
printf "$_containers"
121121
}
@@ -158,7 +158,7 @@ IPA_TESTS_CLIENT_MEMSWAP_LIMIT="$IPA_TESTS_CLIENT_MEMSWAP_LIMIT" \
158158
IPA_TESTS_CLIENT_MEM_RESERVATION="$IPA_TESTS_CLIENT_MEM_RESERVATION" \
159159
IPA_TESTS_SERVER_MEM_RESERVATION="$IPA_TESTS_SERVER_MEM_RESERVATION" \
160160
IPA_TESTS_REPLICA_MEM_RESERVATION="$IPA_TESTS_REPLICA_MEM_RESERVATION" \
161-
docker-compose -p "$PROJECT_ID" up \
161+
docker compose -p "$PROJECT_ID" up \
162162
--scale replica="$IPA_TESTS_REPLICAS" \
163163
--scale client="$IPA_TESTS_CLIENTS" \
164164
--force-recreate --remove-orphans -d
@@ -279,7 +279,7 @@ IPA_TESTS_CLIENT_MEMSWAP_LIMIT="$IPA_TESTS_CLIENT_MEMSWAP_LIMIT" \
279279
IPA_TESTS_CLIENT_MEM_RESERVATION="$IPA_TESTS_CLIENT_MEM_RESERVATION" \
280280
IPA_TESTS_SERVER_MEM_RESERVATION="$IPA_TESTS_SERVER_MEM_RESERVATION" \
281281
IPA_TESTS_REPLICA_MEM_RESERVATION="$IPA_TESTS_REPLICA_MEM_RESERVATION" \
282-
docker-compose -p "$PROJECT_ID" down
282+
docker compose -p "$PROJECT_ID" down
283283
popd
284284

285285
exit $tests_result

ipatests/azure/scripts/setup_containers.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ def __init__(
125125
# initialize containers
126126
self.containers = [
127127
Container(
128-
name=f"{self.prefix}_{self.role}_{c}",
128+
name=f"{self.prefix}-{self.role}-{c}",
129129
hostname=f"{self.role}{c}.{self.domain}",
130130
network=f"{IPA_TESTS_ENV_ID}_{IPA_NETWORK}",
131131
)

0 commit comments

Comments
 (0)