Skip to content

Commit e7ce3dd

Browse files
sandraromanchenkosandraromanchenko
authored
PBM-1448. Fix tests, use perconalab to have the latest PSMDB images, update default to 6.0 (#1050)
1 parent 319eeac commit e7ce3dd

19 files changed

+107
-95
lines changed

‎e2e-tests/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
## Run tests
44
Run all tests
55
```
6-
$ MONGODB_VERSION=5.0 ./run-all
6+
$ MONGODB_VERSION=6.0 ./run-all
77
```
8-
`MONGODB_VERSION` is a PSMDB version (e.g. 5.0/6.0/7.0). Default is `5.0`
8+
`MONGODB_VERSION` is a PSMDB version (e.g. 6.0/7.0/8.0). Default is `6.0`
99

1010
`./run-all` would run all tests both on a sharded cluster and a non-sharded replica set.
1111

@@ -20,9 +20,9 @@ $ MONGODB_VERSION=5.0 ./run-all
2020
## Start test cluster
2121
To start tests with a running pbm-agent and minio storage:
2222
```
23-
$ MONGODB_VERSION=5.0 ./start-cluster
23+
$ MONGODB_VERSION=6.0 ./start-cluster
2424
```
25-
`MONGODB_VERSION` is a PSMDB version (e.g. 5.0/6.0/7.0). Default is `5.0`
25+
`MONGODB_VERSION` is a PSMDB version (e.g. 6.0/7.0/8.0). Default is `6.0`
2626

2727
`./start-replset` - to start a non-sharded replica set.
2828

‎e2e-tests/cmd/pbm-test/run.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,11 @@ func run(t *sharded.Cluster, typ testTyp) {
7373
runTest("Check the Cannot Run Delete During Backup",
7474
t.CannotRunDeleteDuringBackup)
7575

76-
runTest("Check Backup Cancellation",
77-
func() { t.BackupCancellation(storage) })
78-
76+
// Skip test for sharded envs until PBM-1446 is fixed
77+
if typ != testsSharded {
78+
runTest("Check Backup Cancellation",
79+
func() { t.BackupCancellation(storage) })
80+
}
7981
runTest("Leader lag during backup start",
8082
t.LeaderLag)
8183

‎e2e-tests/cmd/pbm-test/run_physical.go

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ import (
44
"context"
55
"math/rand"
66

7+
"golang.org/x/mod/semver"
8+
79
"github.com/percona/percona-backup-mongodb/e2e-tests/pkg/tests/sharded"
810
"github.com/percona/percona-backup-mongodb/pbm/defs"
911
)
@@ -58,8 +60,11 @@ func runPhysical(t *sharded.Cluster, typ testTyp) {
5860
t.DistributedTrxPhysical)
5961
}
6062

61-
runTest("Clock Skew Tests",
62-
func() { t.ClockSkew(defs.PhysicalBackup, cVersion) })
63+
// Skip test for 8.0 until PBM-1447 is fixed
64+
if semver.Compare(cVersion, "v8.0") < 0 {
65+
runTest("Clock Skew Tests",
66+
func() { t.ClockSkew(defs.PhysicalBackup, cVersion) })
67+
}
6368

6469
flushStore(t)
6570
}

‎e2e-tests/docker/docker-compose-remapping.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ services:
2424
dockerfile: ./e2e-tests/docker/mongodb.dockerfile
2525
context: ../..
2626
args:
27-
- MONGODB_VERSION=${MONGODB_VERSION:-5.0}
28-
- MONGODB_IMAGE=${MONGODB_IMAGE:-percona/percona-server-mongodb}
27+
- MONGODB_VERSION=${MONGODB_VERSION:-6.0}
28+
- MONGODB_IMAGE=${MONGODB_IMAGE:-perconalab/percona-server-mongodb}
2929
hostname: rs101
3030
labels:
3131
- "com.percona.pbm.app=mongod"
@@ -54,8 +54,8 @@ services:
5454
dockerfile: ./e2e-tests/docker/pbm.dockerfile
5555
context: ../..
5656
args:
57-
- MONGODB_VERSION=${MONGODB_VERSION:-5.0}
58-
- MONGODB_IMAGE=${MONGODB_IMAGE:-percona/percona-server-mongodb}
57+
- MONGODB_VERSION=${MONGODB_VERSION:-6.0}
58+
- MONGODB_IMAGE=${MONGODB_IMAGE:-perconalab/percona-server-mongodb}
5959
volumes:
6060
- ./conf:/etc/pbm
6161
- ./backups:/opt/backups
@@ -69,8 +69,8 @@ services:
6969
dockerfile: ./e2e-tests/docker/mongodb.dockerfile
7070
context: ../..
7171
args:
72-
- MONGODB_VERSION=${MONGODB_VERSION:-5.0}
73-
- MONGODB_IMAGE=${MONGODB_IMAGE:-percona/percona-server-mongodb}
72+
- MONGODB_VERSION=${MONGODB_VERSION:-6.0}
73+
- MONGODB_IMAGE=${MONGODB_IMAGE:-perconalab/percona-server-mongodb}
7474
hostname: rs201
7575
labels:
7676
- "com.percona.pbm.app=mongod"
@@ -99,8 +99,8 @@ services:
9999
dockerfile: ./e2e-tests/docker/pbm.dockerfile
100100
context: ../..
101101
args:
102-
- MONGODB_VERSION=${MONGODB_VERSION:-5.0}
103-
- MONGODB_IMAGE=${MONGODB_IMAGE:-percona/percona-server-mongodb}
102+
- MONGODB_VERSION=${MONGODB_VERSION:-6.0}
103+
- MONGODB_IMAGE=${MONGODB_IMAGE:-perconalab/percona-server-mongodb}
104104
volumes:
105105
- ./conf:/etc/pbm
106106
- ./backups:/opt/backups

‎e2e-tests/docker/docker-compose-rs.yaml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ services:
2828
dockerfile: ./e2e-tests/docker/pbm.dockerfile
2929
context: ../..
3030
args:
31-
- MONGODB_VERSION=${MONGODB_VERSION:-5.0}
32-
- MONGODB_IMAGE=${MONGODB_IMAGE:-percona/percona-server-mongodb}
31+
- MONGODB_VERSION=${MONGODB_VERSION:-6.0}
32+
- MONGODB_IMAGE=${MONGODB_IMAGE:-perconalab/percona-server-mongodb}
3333
volumes:
3434
- ./conf:/etc/pbm
3535
- ./backups:/opt/backups
@@ -41,8 +41,8 @@ services:
4141
dockerfile: ./e2e-tests/docker/mongodb.dockerfile
4242
context: ../..
4343
args:
44-
- MONGODB_VERSION=${MONGODB_VERSION:-5.0}
45-
- MONGODB_IMAGE=${MONGODB_IMAGE:-percona/percona-server-mongodb}
44+
- MONGODB_VERSION=${MONGODB_VERSION:-6.0}
45+
- MONGODB_IMAGE=${MONGODB_IMAGE:-perconalab/percona-server-mongodb}
4646
hostname: rs101
4747
labels:
4848
- "com.percona.pbm.app=mongod"
@@ -51,7 +51,7 @@ services:
5151
- MONGO_USER=dba
5252
- BACKUP_USER=bcp
5353
- MONGO_PASS=test1234
54-
- MONGODB_VERSION=${MONGODB_VERSION:-5.0}
54+
- MONGODB_VERSION=${MONGODB_VERSION:-6.0}
5555
command: mongod --replSet rs1 --directoryperdb --port 27017 --dbpath=/data/db/ --storageEngine wiredTiger --keyFile /opt/keyFile --wiredTigerCacheSizeGB 1
5656
volumes:
5757
- data-rs101:/data/db
@@ -61,8 +61,8 @@ services:
6161
dockerfile: ./e2e-tests/docker/mongodb.dockerfile
6262
context: ../..
6363
args:
64-
- MONGODB_VERSION=${MONGODB_VERSION:-5.0}
65-
- MONGODB_IMAGE=${MONGODB_IMAGE:-percona/percona-server-mongodb}
64+
- MONGODB_VERSION=${MONGODB_VERSION:-6.0}
65+
- MONGODB_IMAGE=${MONGODB_IMAGE:-perconalab/percona-server-mongodb}
6666
hostname: rs102
6767
labels:
6868
- "com.percona.pbm.app=mongod"
@@ -74,8 +74,8 @@ services:
7474
dockerfile: ./e2e-tests/docker/mongodb.dockerfile
7575
context: ../..
7676
args:
77-
- MONGODB_VERSION=${MONGODB_VERSION:-5.0}
78-
- MONGODB_IMAGE=${MONGODB_IMAGE:-percona/percona-server-mongodb}
77+
- MONGODB_VERSION=${MONGODB_VERSION:-6.0}
78+
- MONGODB_IMAGE=${MONGODB_IMAGE:-perconalab/percona-server-mongodb}
7979
hostname: rs103
8080
labels:
8181
- "com.percona.pbm.app=mongod"
@@ -98,8 +98,8 @@ services:
9898
dockerfile: ./e2e-tests/docker/pbm.dockerfile
9999
context: ../..
100100
args:
101-
- MONGODB_VERSION=${MONGODB_VERSION:-5.0}
102-
- MONGODB_IMAGE=${MONGODB_IMAGE:-percona/percona-server-mongodb}
101+
- MONGODB_VERSION=${MONGODB_VERSION:-6.0}
102+
- MONGODB_IMAGE=${MONGODB_IMAGE:-perconalab/percona-server-mongodb}
103103
volumes:
104104
- ./conf:/etc/pbm
105105
- ./backups:/opt/backups
@@ -123,8 +123,8 @@ services:
123123
dockerfile: ./e2e-tests/docker/pbm.dockerfile
124124
context: ../..
125125
args:
126-
- MONGODB_VERSION=${MONGODB_VERSION:-5.0}
127-
- MONGODB_IMAGE=${MONGODB_IMAGE:-percona/percona-server-mongodb}
126+
- MONGODB_VERSION=${MONGODB_VERSION:-6.0}
127+
- MONGODB_IMAGE=${MONGODB_IMAGE:-perconalab/percona-server-mongodb}
128128
command: pbm-agent
129129
cap_add:
130130
- NET_ADMIN
@@ -147,8 +147,8 @@ services:
147147
dockerfile: ./e2e-tests/docker/pbm.dockerfile
148148
context: ../..
149149
args:
150-
- MONGODB_VERSION=${MONGODB_VERSION:-5.0}
151-
- MONGODB_IMAGE=${MONGODB_IMAGE:-percona/percona-server-mongodb}
150+
- MONGODB_VERSION=${MONGODB_VERSION:-6.0}
151+
- MONGODB_IMAGE=${MONGODB_IMAGE:-perconalab/percona-server-mongodb}
152152
command: pbm-agent
153153
cap_add:
154154
- NET_ADMIN

‎e2e-tests/docker/docker-compose-single.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ services:
2424
dockerfile: ./e2e-tests/docker/mongodb.dockerfile
2525
context: ../..
2626
args:
27-
- MONGODB_VERSION=${MONGODB_VERSION:-5.0}
28-
- MONGODB_IMAGE=${MONGODB_IMAGE:-percona/percona-server-mongodb}
27+
- MONGODB_VERSION=${MONGODB_VERSION:-6.0}
28+
- MONGODB_IMAGE=${MONGODB_IMAGE:-perconalab/percona-server-mongodb}
2929
hostname: rs101
3030
labels:
3131
- "com.percona.pbm.app=mongod"
@@ -35,7 +35,7 @@ services:
3535
- BACKUP_USER=bcp
3636
- MONGO_PASS=test1234
3737
- SINGLE_NODE=true
38-
- MONGODB_VERSION=${MONGODB_VERSION:-5.0}
38+
- MONGODB_VERSION=${MONGODB_VERSION:-6.0}
3939
command: mongod --replSet rs1 --port 27017 --storageEngine wiredTiger --keyFile /opt/keyFile --wiredTigerCacheSizeGB 1
4040
volumes:
4141
- data-rs101:/data/db
@@ -55,8 +55,8 @@ services:
5555
dockerfile: ./e2e-tests/docker/pbm.dockerfile
5656
context: ../..
5757
args:
58-
- MONGODB_VERSION=${MONGODB_VERSION:-5.0}
59-
- MONGODB_IMAGE=${MONGODB_IMAGE:-percona/percona-server-mongodb}
58+
- MONGODB_VERSION=${MONGODB_VERSION:-6.0}
59+
- MONGODB_IMAGE=${MONGODB_IMAGE:-perconalab/percona-server-mongodb}
6060
volumes:
6161
- ./conf:/etc/pbm
6262
- ./backups:/opt/backups

0 commit comments

Comments
 (0)