Skip to content

Commit 3a1fea5

Browse files
defbinolexandr-havryliak
defbin
and
olexandr-havryliak
committed
PSMDB 7.0 GA (#895)
* drop deprecated 4.2 in tests * PSMDB 7.0 GA * add 7.0 support * add 7.0 tests to Jenkinsfile --------- Co-authored-by: Oleksandr Havryliak <[email protected]>
1 parent 29dad4b commit 3a1fea5

18 files changed

+115
-52
lines changed

‎.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
strategy:
3232
fail-fast: false
3333
matrix:
34-
psmdb: ["4.4", "5.0", "6.0"]
34+
psmdb: ["4.4", "5.0", "6.0", "7.0"]
3535
test: [logical, physical, incremental, external]
3636
env:
3737
PBM_BRANCH: ${{ github.event.inputs.pbm_branch || 'main' }}

‎Jenkinsfile

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,15 @@ pipeline {
110110
runTest('New cluster', 'run-new-cluster', '6.0', 'logical')
111111
}
112112
}
113+
stage('New cluster 7.0 logical') {
114+
agent {
115+
label 'docker'
116+
}
117+
steps {
118+
prepareCluster('sharded', '70-newc-logic', '7.0')
119+
runTest('New cluster', 'run-new-cluster', '7.0', 'logical')
120+
}
121+
}
113122

114123
stage('Sharded 4.4 logical') {
115124
agent {
@@ -138,6 +147,15 @@ pipeline {
138147
runTest('Sharded', 'run-sharded', '6.0', 'logical')
139148
}
140149
}
150+
stage('Sharded 7.0 logical') {
151+
agent {
152+
label 'docker-32gb'
153+
}
154+
steps {
155+
prepareCluster('sharded', '70-shrd-logic', '7.0')
156+
runTest('Sharded', 'run-sharded', '7.0', 'logical')
157+
}
158+
}
141159

142160
stage('Non-sharded 4.4 logical') {
143161
agent {
@@ -166,6 +184,15 @@ pipeline {
166184
runTest('Non-sharded', 'run-rs', '6.0', 'logical')
167185
}
168186
}
187+
stage('Non-sharded 7.0 logical') {
188+
agent {
189+
label 'docker'
190+
}
191+
steps {
192+
prepareCluster('rs', '70-rs-logic', '7.0')
193+
runTest('Non-sharded', 'run-rs', '7.0', 'logical')
194+
}
195+
}
169196

170197
stage('Single-node 4.4 logical') {
171198
agent {
@@ -194,6 +221,15 @@ pipeline {
194221
runTest('Single-node', 'run-single', '6.0', 'logical')
195222
}
196223
}
224+
stage('Single-node 7.0 logical') {
225+
agent {
226+
label 'docker'
227+
}
228+
steps {
229+
prepareCluster('single', '70-single-logic', '7.0')
230+
runTest('Single-node', 'run-single', '7.0', 'logical')
231+
}
232+
}
197233

198234
stage('Sharded 4.4 physical') {
199235
agent {
@@ -222,6 +258,15 @@ pipeline {
222258
runTest('Sharded', 'run-sharded', '6.0', 'physical')
223259
}
224260
}
261+
stage('Sharded 7.0 physical') {
262+
agent {
263+
label 'docker-32gb'
264+
}
265+
steps {
266+
prepareCluster('sharded', '70-shrd-phys', '7.0')
267+
runTest('Sharded', 'run-sharded', '7.0', 'physical')
268+
}
269+
}
225270

226271
stage('Non-sharded 4.4 physical') {
227272
agent {
@@ -250,6 +295,15 @@ pipeline {
250295
runTest('Non-sharded', 'run-rs', '6.0', 'physical')
251296
}
252297
}
298+
stage('Non-sharded 7.0 physical') {
299+
agent {
300+
label 'docker'
301+
}
302+
steps {
303+
prepareCluster('rs', '70-rs-phys', '7.0')
304+
runTest('Non-sharded', 'run-rs', '7.0', 'physical')
305+
}
306+
}
253307

254308
stage('Single-node 4.4 physical') {
255309
agent {
@@ -278,6 +332,15 @@ pipeline {
278332
runTest('Single-node', 'run-single', '6.0', 'physical')
279333
}
280334
}
335+
stage('Single-node 7.0 physical') {
336+
agent {
337+
label 'docker'
338+
}
339+
steps {
340+
prepareCluster('single', '70-single-phys', '7.0')
341+
runTest('Single-node', 'run-single', '7.0', 'physical')
342+
}
343+
}
281344
}
282345
}
283346
}

‎e2e-tests/README.md

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

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

@@ -22,7 +22,7 @@ To start tests with a running pbm-agent and minio storage:
2222
```
2323
$ MONGODB_VERSION=4.4 ./start-cluster
2424
```
25-
`MONGODB_VERSION` is a PSMDB version (e.g. 4.0/4.2/4.4). Default is `4.2`
25+
`MONGODB_VERSION` is a PSMDB version (e.g. 4.4/5.0/6.0). Default is `4.4`
2626

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

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ services:
2525
dockerfile: ./e2e-tests/docker/mongodb-rs/Dockerfile
2626
context: ../..
2727
args:
28-
- MONGODB_VERSION=${MONGODB_VERSION:-4.2}
28+
- MONGODB_VERSION=${MONGODB_VERSION:-4.4}
2929
- MONGODB_IMAGE=${MONGODB_IMAGE:-percona/percona-server-mongodb}
3030
hostname: rs101
3131
labels:
@@ -55,7 +55,7 @@ services:
5555
dockerfile: ./e2e-tests/docker/pbm-agent/Dockerfile
5656
context: ../..
5757
args:
58-
- MONGODB_VERSION=${MONGODB_VERSION:-4.2}
58+
- MONGODB_VERSION=${MONGODB_VERSION:-4.4}
5959
- MONGODB_IMAGE=${MONGODB_IMAGE:-percona/percona-server-mongodb}
6060
volumes:
6161
- ./conf:/etc/pbm
@@ -70,7 +70,7 @@ services:
7070
dockerfile: ./e2e-tests/docker/mongodb-rs/Dockerfile
7171
context: ../..
7272
args:
73-
- MONGODB_VERSION=${MONGODB_VERSION:-4.2}
73+
- MONGODB_VERSION=${MONGODB_VERSION:-4.4}
7474
- MONGODB_IMAGE=${MONGODB_IMAGE:-percona/percona-server-mongodb}
7575
hostname: rs201
7676
labels:
@@ -100,7 +100,7 @@ services:
100100
dockerfile: ./e2e-tests/docker/pbm-agent/Dockerfile
101101
context: ../..
102102
args:
103-
- MONGODB_VERSION=${MONGODB_VERSION:-4.2}
103+
- MONGODB_VERSION=${MONGODB_VERSION:-4.4}
104104
- MONGODB_IMAGE=${MONGODB_IMAGE:-percona/percona-server-mongodb}
105105
volumes:
106106
- ./conf:/etc/pbm

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ services:
2929
dockerfile: ./e2e-tests/docker/pbm-agent/Dockerfile
3030
context: ../..
3131
args:
32-
- MONGODB_VERSION=${MONGODB_VERSION:-4.2}
32+
- MONGODB_VERSION=${MONGODB_VERSION:-4.4}
3333
- MONGODB_IMAGE=${MONGODB_IMAGE:-percona/percona-server-mongodb}
3434
volumes:
3535
- ./conf:/etc/pbm
@@ -42,7 +42,7 @@ services:
4242
dockerfile: ./e2e-tests/docker/mongodb-rs/Dockerfile
4343
context: ../..
4444
args:
45-
- MONGODB_VERSION=${MONGODB_VERSION:-4.2}
45+
- MONGODB_VERSION=${MONGODB_VERSION:-4.4}
4646
- MONGODB_IMAGE=${MONGODB_IMAGE:-percona/percona-server-mongodb}
4747
hostname: rs101
4848
labels:
@@ -52,7 +52,7 @@ services:
5252
- MONGO_USER=dba
5353
- BACKUP_USER=bcp
5454
- MONGO_PASS=test1234
55-
- MONGODB_VERSION=${MONGODB_VERSION:-4.2}
55+
- MONGODB_VERSION=${MONGODB_VERSION:-4.4}
5656
command: mongod --replSet rs1 --directoryperdb --port 27017 --dbpath=/data/db/ --storageEngine wiredTiger --keyFile /opt/keyFile --wiredTigerCacheSizeGB 1
5757
volumes:
5858
- data-rs101:/data/db
@@ -62,7 +62,7 @@ services:
6262
dockerfile: ./e2e-tests/docker/mongodb-rs/Dockerfile
6363
context: ../..
6464
args:
65-
- MONGODB_VERSION=${MONGODB_VERSION:-4.2}
65+
- MONGODB_VERSION=${MONGODB_VERSION:-4.4}
6666
- MONGODB_IMAGE=${MONGODB_IMAGE:-percona/percona-server-mongodb}
6767
hostname: rs102
6868
labels:
@@ -75,7 +75,7 @@ services:
7575
dockerfile: ./e2e-tests/docker/mongodb-rs/Dockerfile
7676
context: ../..
7777
args:
78-
- MONGODB_VERSION=${MONGODB_VERSION:-4.2}
78+
- MONGODB_VERSION=${MONGODB_VERSION:-4.4}
7979
- MONGODB_IMAGE=${MONGODB_IMAGE:-percona/percona-server-mongodb}
8080
hostname: rs103
8181
labels:
@@ -99,7 +99,7 @@ services:
9999
dockerfile: ./e2e-tests/docker/pbm-agent/Dockerfile
100100
context: ../..
101101
args:
102-
- MONGODB_VERSION=${MONGODB_VERSION:-4.2}
102+
- MONGODB_VERSION=${MONGODB_VERSION:-4.4}
103103
- MONGODB_IMAGE=${MONGODB_IMAGE:-percona/percona-server-mongodb}
104104
volumes:
105105
- ./conf:/etc/pbm
@@ -124,7 +124,7 @@ services:
124124
dockerfile: ./e2e-tests/docker/pbm-agent/Dockerfile
125125
context: ../..
126126
args:
127-
- MONGODB_VERSION=${MONGODB_VERSION:-4.2}
127+
- MONGODB_VERSION=${MONGODB_VERSION:-4.4}
128128
- MONGODB_IMAGE=${MONGODB_IMAGE:-percona/percona-server-mongodb}
129129
command: pbm-agent
130130
cap_add:
@@ -148,7 +148,7 @@ services:
148148
dockerfile: ./e2e-tests/docker/pbm-agent/Dockerfile
149149
context: ../..
150150
args:
151-
- MONGODB_VERSION=${MONGODB_VERSION:-4.2}
151+
- MONGODB_VERSION=${MONGODB_VERSION:-4.4}
152152
- MONGODB_IMAGE=${MONGODB_IMAGE:-percona/percona-server-mongodb}
153153
command: pbm-agent
154154
cap_add:

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ services:
2525
dockerfile: ./e2e-tests/docker/mongodb-rs/Dockerfile
2626
context: ../..
2727
args:
28-
- MONGODB_VERSION=${MONGODB_VERSION:-4.2}
28+
- MONGODB_VERSION=${MONGODB_VERSION:-4.4}
2929
- MONGODB_IMAGE=${MONGODB_IMAGE:-percona/percona-server-mongodb}
3030
hostname: rs101
3131
labels:
@@ -36,7 +36,7 @@ services:
3636
- BACKUP_USER=bcp
3737
- MONGO_PASS=test1234
3838
- SINGLE_NODE=true
39-
- MONGODB_VERSION=${MONGODB_VERSION:-4.2}
39+
- MONGODB_VERSION=${MONGODB_VERSION:-4.4}
4040
command: mongod --replSet rs1 --port 27017 --storageEngine wiredTiger --keyFile /opt/keyFile --wiredTigerCacheSizeGB 1
4141
volumes:
4242
- data-rs101:/data/db
@@ -56,7 +56,7 @@ services:
5656
dockerfile: ./e2e-tests/docker/pbm-agent/Dockerfile
5757
context: ../..
5858
args:
59-
- MONGODB_VERSION=${MONGODB_VERSION:-4.2}
59+
- MONGODB_VERSION=${MONGODB_VERSION:-4.4}
6060
- MONGODB_IMAGE=${MONGODB_IMAGE:-percona/percona-server-mongodb}
6161
volumes:
6262
- ./conf:/etc/pbm

0 commit comments

Comments
 (0)