Skip to content

Commit 562f566

Browse files
yurkovychvyurkovychv
authored
PMM-13331 fix pbm mongo setup for ol9 (#77)
* PMM-13331 fix pbm mongo setup for ol9 * PMM-13331 update workers and fix sharded setup * PMM-13331 fix diff auth tests
1 parent efb5298 commit 562f566

File tree

13 files changed

+91
-74
lines changed

13 files changed

+91
-74
lines changed

‎.github/workflows/PMM_PSMDB_PBM.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ on:
2626

2727
jobs:
2828
test_replica_set:
29-
runs-on: ubuntu-20.04
29+
runs-on: ubuntu-22.04
3030
timeout-minutes: 20
3131
env:
3232
PSMDB_VERSION: ${{ github.event.inputs.psmdb_version || 'latest' }}
@@ -41,7 +41,7 @@ jobs:
4141
working-directory: ./pmm_psmdb-pbm_setup
4242

4343
test_sharded_cluster:
44-
runs-on: ubuntu-20.04
44+
runs-on: ubuntu-22.04
4545
timeout-minutes: 20
4646
env:
4747
PSMDB_VERSION: ${{ github.event.inputs.psmdb_version || 'latest' }}
@@ -56,7 +56,7 @@ jobs:
5656
working-directory: ./pmm_psmdb-pbm_setup
5757

5858
test_diff_auth:
59-
runs-on: ubuntu-20.04
59+
runs-on: ubuntu-22.04
6060
timeout-minutes: 20
6161
env:
6262
PSMDB_VERSION: ${{ github.event.inputs.psmdb_version || 'latest' }}

‎pmm_psmdb-pbm_setup/configure-agents.sh‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,23 +12,23 @@ nodes="rs101 rs102 rs103"
1212
for node in $nodes
1313
do
1414
echo "congiguring pbm agent on $node"
15-
docker-compose -f docker-compose-rs.yaml exec -T $node bash -c "echo \"PBM_MONGODB_URI=mongodb://${pbm_user}:${pbm_pass}@127.0.0.1:27017\" > /etc/sysconfig/pbm-agent"
15+
docker compose -f docker-compose-rs.yaml exec -T $node bash -c "echo \"PBM_MONGODB_URI=mongodb://${pbm_user}:${pbm_pass}@127.0.0.1:27017\" > /etc/sysconfig/pbm-agent"
1616
echo "restarting pbm agent on $node"
17-
docker-compose -f docker-compose-rs.yaml exec -T $node systemctl restart pbm-agent
17+
docker compose -f docker-compose-rs.yaml exec -T $node systemctl restart pbm-agent
1818
done
1919
echo
2020
echo "configuring pmm agents"
2121
nodes="rs101 rs102 rs103"
2222
for node in $nodes
2323
do
2424
echo "congiguring pmm agent on $node"
25-
docker-compose -f docker-compose-rs.yaml exec -T $node pmm-agent setup
26-
docker-compose -f docker-compose-rs.yaml exec -T $node pmm-admin add mongodb --enable-all-collectors --cluster=replicaset --replication-set=rs --username=${pmm_mongo_user} --password=${pmm_mongo_user_pass} $node 127.0.0.1:27017
25+
docker compose -f docker-compose-rs.yaml exec -T $node pmm-agent setup
26+
docker compose -f docker-compose-rs.yaml exec -T $node pmm-admin add mongodb --enable-all-collectors --cluster=replicaset --replication-set=rs --username=${pmm_mongo_user} --password=${pmm_mongo_user_pass} $node 127.0.0.1:27017
2727
done
2828
echo
2929
echo "adding some data"
30-
docker-compose -f docker-compose-rs.yaml exec -T rs101 mgodatagen -f /etc/datagen/replicaset.json --uri=mongodb://${pmm_mongo_user}:${pmm_mongo_user_pass}@127.0.0.1:27017/?replicaSet=rs
31-
docker-compose -f docker-compose-rs.yaml exec -T rs101 mongo "mongodb://${pmm_mongo_user}:${pmm_mongo_user_pass}@localhost/?replicaSet=rs" --quiet << EOF
30+
docker compose -f docker-compose-rs.yaml exec -T rs101 mgodatagen -f /etc/datagen/replicaset.json --uri=mongodb://${pmm_mongo_user}:${pmm_mongo_user_pass}@127.0.0.1:27017/?replicaSet=rs
31+
docker compose -f docker-compose-rs.yaml exec -T rs101 mongo "mongodb://${pmm_mongo_user}:${pmm_mongo_user_pass}@localhost/?replicaSet=rs" --quiet << EOF
3232
use students;
3333
db.students.insertMany([
3434
{

‎pmm_psmdb-pbm_setup/configure-extra-agents.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@ nodes="rs201 rs202 rs203"
1212
for node in $nodes
1313
do
1414
echo "configuring pbm agent on $node"
15-
docker-compose -f docker-compose-rs.yaml exec -T $node bash -c "echo \"PBM_MONGODB_URI=mongodb://${pbm_user}:${pbm_pass}@127.0.0.1:27017\" > /etc/sysconfig/pbm-agent"
15+
docker compose -f docker-compose-rs.yaml exec -T $node bash -c "echo \"PBM_MONGODB_URI=mongodb://${pbm_user}:${pbm_pass}@127.0.0.1:27017\" > /etc/sysconfig/pbm-agent"
1616
echo "restarting pbm agent on $node"
17-
docker-compose -f docker-compose-rs.yaml exec -T $node systemctl restart pbm-agent
17+
docker compose -f docker-compose-rs.yaml exec -T $node systemctl restart pbm-agent
1818
done
1919
echo
2020
echo "configuring pmm agents"
2121
nodes="rs201 rs202 rs203"
2222
for node in $nodes
2323
do
2424
echo "configuring pmm agent on $node"
25-
docker-compose -f docker-compose-rs.yaml exec -T $node pmm-agent setup
26-
docker-compose -f docker-compose-rs.yaml exec -T $node pmm-admin add mongodb --cluster=replicaset1 --replication-set=rs1 --username=${pmm_mongo_user} --password=${pmm_mongo_user_pass} $node 127.0.0.1:27017
25+
docker compose -f docker-compose-rs.yaml exec -T $node pmm-agent setup
26+
docker compose -f docker-compose-rs.yaml exec -T $node pmm-admin add mongodb --cluster=replicaset1 --replication-set=rs1 --username=${pmm_mongo_user} --password=${pmm_mongo_user_pass} $node 127.0.0.1:27017
2727
done
2828
echo

‎pmm_psmdb-pbm_setup/configure-extra-replset.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ pbm_pass=${PBM_PASS:-pbmpass}
88

99
echo
1010
echo "configuring replicaset with members priorities"
11-
docker-compose -f docker-compose-rs.yaml exec -T rs201 mongo --quiet << EOF
11+
docker compose -f docker-compose-rs.yaml exec -T rs201 mongo --quiet << EOF
1212
config = {
1313
"_id" : "rs",
1414
"members" : [
@@ -35,12 +35,12 @@ echo
3535
sleep 60
3636
echo
3737
echo "configuring root user on primary"
38-
docker-compose -f docker-compose-rs.yaml exec -T rs201 mongo --quiet << EOF
38+
docker compose -f docker-compose-rs.yaml exec -T rs201 mongo --quiet << EOF
3939
db.getSiblingDB("admin").createUser({ user: "root", pwd: "root", roles: [ "root", "userAdminAnyDatabase", "clusterAdmin" ] });
4040
EOF
4141
echo
4242
echo "configuring pbm and pmm roles"
43-
docker-compose -f docker-compose-rs.yaml exec -T rs201 mongo "mongodb://root:root@localhost/?replicaSet=rs" --quiet << EOF
43+
docker compose -f docker-compose-rs.yaml exec -T rs201 mongo "mongodb://root:root@localhost/?replicaSet=rs" --quiet << EOF
4444
db.getSiblingDB("admin").createRole({
4545
"role": "pbmAnyAction",
4646
"privileges": [{
@@ -70,7 +70,7 @@ db.getSiblingDB("admin").createRole({
7070
EOF
7171
echo
7272
echo "creating pbm user"
73-
docker-compose -f docker-compose-rs.yaml exec -T rs201 mongo "mongodb://root:root@localhost/?replicaSet=rs" --quiet << EOF
73+
docker compose -f docker-compose-rs.yaml exec -T rs201 mongo "mongodb://root:root@localhost/?replicaSet=rs" --quiet << EOF
7474
db.getSiblingDB("admin").createUser({
7575
user: "${pbm_user}",
7676
pwd: "${pbm_pass}",
@@ -85,7 +85,7 @@ db.getSiblingDB("admin").createUser({
8585
EOF
8686
echo
8787
echo "creating pmm user"
88-
docker-compose -f docker-compose-rs.yaml exec -T rs201 mongo "mongodb://root:root@localhost/?replicaSet=rs" --quiet << EOF
88+
docker compose -f docker-compose-rs.yaml exec -T rs201 mongo "mongodb://root:root@localhost/?replicaSet=rs" --quiet << EOF
8989
db.getSiblingDB("admin").createUser({
9090
user: "${pmm_mongo_user}",
9191
pwd: "${pmm_mongo_user_pass}",

‎pmm_psmdb-pbm_setup/configure-psa.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ pbm_pass=${PBM_PASS:-pbmpass}
88

99
echo
1010
echo "configuring replicaset with members priorities"
11-
docker-compose -f docker-compose-rs.yaml exec -T rs101 mongo --quiet << EOF
11+
docker compose -f docker-compose-rs.yaml exec -T rs101 mongo --quiet << EOF
1212
config = {
1313
"_id" : "rs",
1414
"members" : [
@@ -35,12 +35,12 @@ echo
3535
sleep 60
3636
echo
3737
echo "configuring root user on primary"
38-
docker-compose -f docker-compose-rs.yaml exec -T rs101 mongo --quiet << EOF
38+
docker compose -f docker-compose-rs.yaml exec -T rs101 mongo --quiet << EOF
3939
db.getSiblingDB("admin").createUser({ user: "root", pwd: "root", roles: [ "root", "userAdminAnyDatabase", "clusterAdmin" ] });
4040
EOF
4141
echo
4242
echo "configuring pbm and pmm roles"
43-
docker-compose -f docker-compose-rs.yaml exec -T rs101 mongo "mongodb://root:root@localhost/?replicaSet=rs" --quiet << EOF
43+
docker compose -f docker-compose-rs.yaml exec -T rs101 mongo "mongodb://root:root@localhost/?replicaSet=rs" --quiet << EOF
4444
db.getSiblingDB("admin").createRole({
4545
"role": "pbmAnyAction",
4646
"privileges": [{
@@ -70,7 +70,7 @@ db.getSiblingDB("admin").createRole({
7070
EOF
7171
echo
7272
echo "creating pbm user"
73-
docker-compose -f docker-compose-rs.yaml exec -T rs101 mongo "mongodb://root:root@localhost/?replicaSet=rs" --quiet << EOF
73+
docker compose -f docker-compose-rs.yaml exec -T rs101 mongo "mongodb://root:root@localhost/?replicaSet=rs" --quiet << EOF
7474
db.getSiblingDB("admin").createUser({
7575
user: "${pbm_user}",
7676
pwd: "${pbm_pass}",
@@ -85,7 +85,7 @@ db.getSiblingDB("admin").createUser({
8585
EOF
8686
echo
8787
echo "creating pmm user"
88-
docker-compose -f docker-compose-rs.yaml exec -T rs101 mongo "mongodb://root:root@localhost/?replicaSet=rs" --quiet << EOF
88+
docker compose -f docker-compose-rs.yaml exec -T rs101 mongo "mongodb://root:root@localhost/?replicaSet=rs" --quiet << EOF
8989
db.getSiblingDB("admin").createUser({
9090
user: "${pmm_mongo_user}",
9191
pwd: "${pmm_mongo_user_pass}",

‎pmm_psmdb-pbm_setup/configure-replset.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ pbm_pass=${PBM_PASS:-pbmpass}
88

99
echo
1010
echo "configuring replicaset with members priorities"
11-
docker-compose -f docker-compose-rs.yaml exec -T rs101 mongo --quiet << EOF
11+
docker compose -f docker-compose-rs.yaml exec -T rs101 mongo --quiet << EOF
1212
config = {
1313
"_id" : "rs",
1414
"members" : [
@@ -35,12 +35,12 @@ echo
3535
sleep 60
3636
echo
3737
echo "configuring root user on primary"
38-
docker-compose -f docker-compose-rs.yaml exec -T rs101 mongo --quiet << EOF
38+
docker compose -f docker-compose-rs.yaml exec -T rs101 mongo --quiet << EOF
3939
db.getSiblingDB("admin").createUser({ user: "root", pwd: "root", roles: [ "root", "userAdminAnyDatabase", "clusterAdmin" ] });
4040
EOF
4141
echo
4242
echo "configuring pbm and pmm roles"
43-
docker-compose -f docker-compose-rs.yaml exec -T rs101 mongo "mongodb://root:root@localhost/?replicaSet=rs" --quiet << EOF
43+
docker compose -f docker-compose-rs.yaml exec -T rs101 mongo "mongodb://root:root@localhost/?replicaSet=rs" --quiet << EOF
4444
db.getSiblingDB("admin").createRole({
4545
"role": "pbmAnyAction",
4646
"privileges": [{
@@ -70,7 +70,7 @@ db.getSiblingDB("admin").createRole({
7070
EOF
7171
echo
7272
echo "creating pbm user"
73-
docker-compose -f docker-compose-rs.yaml exec -T rs101 mongo "mongodb://root:root@localhost/?replicaSet=rs" --quiet << EOF
73+
docker compose -f docker-compose-rs.yaml exec -T rs101 mongo "mongodb://root:root@localhost/?replicaSet=rs" --quiet << EOF
7474
db.getSiblingDB("admin").createUser({
7575
user: "${pbm_user}",
7676
pwd: "${pbm_pass}",
@@ -85,7 +85,7 @@ db.getSiblingDB("admin").createUser({
8585
EOF
8686
echo
8787
echo "creating pmm user"
88-
docker-compose -f docker-compose-rs.yaml exec -T rs101 mongo "mongodb://root:root@localhost/?replicaSet=rs" --quiet << EOF
88+
docker compose -f docker-compose-rs.yaml exec -T rs101 mongo "mongodb://root:root@localhost/?replicaSet=rs" --quiet << EOF
8989
db.getSiblingDB("admin").createUser({
9090
user: "${pmm_mongo_user}",
9191
pwd: "${pmm_mongo_user_pass}",

‎pmm_psmdb-pbm_setup/docker-compose-rs.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ services:
3434
- /sys/fs/cgroup:/sys/fs/cgroup:rw
3535
- /tmp/backup_data:/tmp/backup_data
3636
privileged: true
37+
cgroup: host
3738
environment:
3839
PBM_MONGODB_URI: mongodb://${PBM_USER:-pbm}:${PBM_PASS:-pbmpass}@127.0.0.1:27017
3940
PMM_AGENT_SERVER_ADDRESS: ${PMM_SERVER_CONTAINER_ADDRESS:-pmm-server:443}
@@ -60,6 +61,7 @@ services:
6061
- /sys/fs/cgroup:/sys/fs/cgroup:rw
6162
- /tmp/backup_data:/tmp/backup_data
6263
privileged: true
64+
cgroup: host
6365
environment:
6466
PBM_MONGODB_URI: mongodb://${PBM_USER:-pbm}:${PBM_PASS:-pbmpass}@127.0.0.1:27017
6567
PMM_AGENT_SERVER_ADDRESS: ${PMM_SERVER_CONTAINER_ADDRESS:-pmm-server:443}
@@ -86,6 +88,7 @@ services:
8688
- /sys/fs/cgroup:/sys/fs/cgroup:rw
8789
- /tmp/backup_data:/tmp/backup_data
8890
privileged: true
91+
cgroup: host
8992
environment:
9093
PBM_MONGODB_URI: mongodb://${PBM_USER:-pbm}:${PBM_PASS:-pbmpass}@127.0.0.1:27017
9194
PMM_AGENT_SERVER_ADDRESS: ${PMM_SERVER_CONTAINER_ADDRESS:-pmm-server:443}
@@ -114,6 +117,7 @@ services:
114117
- /sys/fs/cgroup:/sys/fs/cgroup:rw
115118
- /tmp/backup_data:/tmp/backup_data
116119
privileged: true
120+
cgroup: host
117121
environment:
118122
PBM_MONGODB_URI: mongodb://${PBM_USER:-pbm}:${PBM_PASS:-pbmpass}@127.0.0.1:27017
119123
PMM_AGENT_SERVER_ADDRESS: ${PMM_SERVER_CONTAINER_ADDRESS:-pmm-server:443}
@@ -140,6 +144,7 @@ services:
140144
- /sys/fs/cgroup:/sys/fs/cgroup:rw
141145
- /tmp/backup_data:/tmp/backup_data
142146
privileged: true
147+
cgroup: host
143148
environment:
144149
PBM_MONGODB_URI: mongodb://${PBM_USER:-pbm}:${PBM_PASS:-pbmpass}@127.0.0.1:27017
145150
PMM_AGENT_SERVER_ADDRESS: ${PMM_SERVER_CONTAINER_ADDRESS:-pmm-server:443}
@@ -166,6 +171,7 @@ services:
166171
- /sys/fs/cgroup:/sys/fs/cgroup:rw
167172
- /tmp/backup_data:/tmp/backup_data
168173
privileged: true
174+
cgroup: host
169175
environment:
170176
PBM_MONGODB_URI: mongodb://${PBM_USER:-pbm}:${PBM_PASS:-pbmpass}@127.0.0.1:27017
171177
PMM_AGENT_SERVER_ADDRESS: ${PMM_SERVER_CONTAINER_ADDRESS:-pmm-server:443}

‎pmm_psmdb-pbm_setup/docker-compose-sharded.yaml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ services:
2222
- ./conf/mongod-rs1:/etc/mongod
2323
- /sys/fs/cgroup:/sys/fs/cgroup:rw
2424
privileged: true
25+
cgroup: host
2526
environment:
2627
- "PBM_MONGODB_URI=mongodb://${PBM_USER:-pbm}:${PBM_PASS:-pbmpass}@127.0.0.1:27017"
2728
- "PMM_AGENT_SERVER_ADDRESS=pmm-server:443"
@@ -42,6 +43,7 @@ services:
4243
- ./conf/mongod-rs1:/etc/mongod
4344
- /sys/fs/cgroup:/sys/fs/cgroup:rw
4445
privileged: true
46+
cgroup: host
4547
environment:
4648
- "PBM_MONGODB_URI=mongodb://${PBM_USER:-pbm}:${PBM_PASS:-pbmpass}@127.0.0.1:27017"
4749
- "PMM_AGENT_SERVER_ADDRESS=pmm-server:443"
@@ -62,6 +64,7 @@ services:
6264
- ./conf/mongod-rs1:/etc/mongod
6365
- /sys/fs/cgroup:/sys/fs/cgroup:rw
6466
privileged: true
67+
cgroup: host
6568
environment:
6669
- "PBM_MONGODB_URI=mongodb://${PBM_USER:-pbm}:${PBM_PASS:-pbmpass}@127.0.0.1:27017"
6770
- "PMM_AGENT_SERVER_ADDRESS=pmm-server:443"
@@ -82,6 +85,7 @@ services:
8285
- ./conf/mongod-rs2:/etc/mongod
8386
- /sys/fs/cgroup:/sys/fs/cgroup:rw
8487
privileged: true
88+
cgroup: host
8589
environment:
8690
- "PBM_MONGODB_URI=mongodb://${PBM_USER:-pbm}:${PBM_PASS:-pbmpass}@127.0.0.1:27017"
8791
- "PMM_AGENT_SERVER_ADDRESS=pmm-server:443"
@@ -102,6 +106,7 @@ services:
102106
- ./conf/mongod-rs2:/etc/mongod
103107
- /sys/fs/cgroup:/sys/fs/cgroup:rw
104108
privileged: true
109+
cgroup: host
105110
environment:
106111
- "PBM_MONGODB_URI=mongodb://${PBM_USER:-pbm}:${PBM_PASS:-pbmpass}@127.0.0.1:27017"
107112
- "PMM_AGENT_SERVER_ADDRESS=pmm-server:443"
@@ -122,6 +127,7 @@ services:
122127
- ./conf/mongod-rs2:/etc/mongod
123128
- /sys/fs/cgroup:/sys/fs/cgroup:rw
124129
privileged: true
130+
cgroup: host
125131
environment:
126132
- "PBM_MONGODB_URI=mongodb://${PBM_USER:-pbm}:${PBM_PASS:-pbmpass}@127.0.0.1:27017"
127133
- "PMM_AGENT_SERVER_ADDRESS=pmm-server:443"
@@ -142,6 +148,7 @@ services:
142148
- ./conf/mongod-cfg:/etc/mongod
143149
- /sys/fs/cgroup:/sys/fs/cgroup:rw
144150
privileged: true
151+
cgroup: host
145152
environment:
146153
- "PBM_MONGODB_URI=mongodb://${PBM_USER:-pbm}:${PBM_PASS:-pbmpass}@127.0.0.1:27017"
147154
- "PMM_AGENT_SERVER_ADDRESS=pmm-server:443"
@@ -162,6 +169,7 @@ services:
162169
- ./conf/mongod-cfg:/etc/mongod
163170
- /sys/fs/cgroup:/sys/fs/cgroup:rw
164171
privileged: true
172+
cgroup: host
165173
environment:
166174
- "PBM_MONGODB_URI=mongodb://${PBM_USER:-pbm}:${PBM_PASS:-pbmpass}@127.0.0.1:27017"
167175
- "PMM_AGENT_SERVER_ADDRESS=pmm-server:443"
@@ -182,6 +190,7 @@ services:
182190
- ./conf/mongod-cfg:/etc/mongod
183191
- /sys/fs/cgroup:/sys/fs/cgroup:rw
184192
privileged: true
193+
cgroup: host
185194
environment:
186195
- "PBM_MONGODB_URI=mongodb://${PBM_USER:-pbm}:${PBM_PASS:-pbmpass}@127.0.0.1:27017"
187196
- "PMM_AGENT_SERVER_ADDRESS=pmm-server:443"
@@ -203,6 +212,7 @@ services:
203212
- /sys/fs/cgroup:/sys/fs/cgroup:rw
204213
- ./conf/datagen:/etc/datagen:ro
205214
privileged: true
215+
cgroup: host
206216
command: "mongos --keyFile=/etc/keyfile --configdb rscfg/rscfg01:27017,rscfg02:27017,rscfg03:27017 --port 27017 --bind_ip 0.0.0.0"
207217
networks:
208218
- test-network

‎pmm_psmdb-pbm_setup/start-rs-only.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ docker network create pmm2-ui-tests_pmm-network || true
1111

1212
export COMPOSE_PROFILES=${profile}
1313

14-
docker-compose -f docker-compose-rs.yaml down -v --remove-orphans
15-
docker-compose -f docker-compose-rs.yaml build --no-cache
16-
docker-compose -f docker-compose-rs.yaml up -d
14+
docker compose -f docker-compose-rs.yaml down -v --remove-orphans
15+
docker compose -f docker-compose-rs.yaml build --no-cache
16+
docker compose -f docker-compose-rs.yaml up -d
1717
echo
1818
echo "waiting 30 seconds for replica set members to start"
1919
sleep 30

‎pmm_psmdb-pbm_setup/start-rs.sh‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@ docker network create pmm2-ui-tests_pmm-network || true
1212

1313
export COMPOSE_PROFILES=${profile}
1414

15-
docker-compose -f docker-compose-rs.yaml -f docker-compose-pmm.yaml down -v --remove-orphans
16-
docker-compose -f docker-compose-rs.yaml -f docker-compose-pmm.yaml build
17-
docker-compose -f docker-compose-pmm.yaml -f docker-compose-rs.yaml up -d
15+
docker compose -f docker-compose-rs.yaml -f docker-compose-pmm.yaml down -v --remove-orphans
16+
docker compose -f docker-compose-rs.yaml -f docker-compose-pmm.yaml build
17+
docker compose -f docker-compose-pmm.yaml -f docker-compose-rs.yaml up -d
1818
echo
1919
echo "waiting 30 seconds for pmm-server to start"
2020
sleep 30
2121
echo "configuring pmm-server"
22-
docker-compose -f docker-compose-pmm.yaml exec -T pmm-server change-admin-password $pmm_server_admin_pass
22+
docker compose -f docker-compose-pmm.yaml exec -T pmm-server change-admin-password $pmm_server_admin_pass
2323
echo "restarting pmm-server"
24-
docker-compose -f docker-compose-pmm.yaml restart pmm-server
24+
docker compose -f docker-compose-pmm.yaml restart pmm-server
2525
echo "waiting 30 seconds for pmm-server to start"
2626
sleep 30
2727
bash -e ./configure-replset.sh
@@ -30,8 +30,8 @@ tests=${TESTS:-yes}
3030
if [ $tests != "no" ]; then
3131
echo
3232
echo "running tests"
33-
docker-compose -f docker-compose-pmm.yaml run test pytest -s -x --verbose test.py
34-
docker-compose -f docker-compose-pmm.yaml run test chmod -R 777 .
33+
docker compose -f docker-compose-pmm.yaml run test pytest -s -x --verbose test.py
34+
docker compose -f docker-compose-pmm.yaml run test chmod -R 777 .
3535
else
3636
echo
3737
echo "skipping tests"
@@ -40,7 +40,7 @@ cleanup=${CLEANUP:-yes}
4040
if [ $cleanup != "no" ]; then
4141
echo
4242
echo "cleanup"
43-
docker-compose -f docker-compose-rs.yaml -f docker-compose-pmm.yaml down -v --remove-orphans
43+
docker compose -f docker-compose-rs.yaml -f docker-compose-pmm.yaml down -v --remove-orphans
4444
else
4545
echo
4646
echo "skipping cleanup"

0 commit comments

Comments
 (0)