Skip to content

Commit 2c8b6a4

Browse files
alcaeusalcaeus
authored
PHPC-2555: Stop testing with MongoDB 4.0 (#1827)
* Remove server version 4.0 from testing * All tested server versions support transactions * Remove tests/skips no longer relevant * Simplify skips that are no longer version dependent
1 parent 9147f6c commit 2c8b6a4

File tree

59 files changed

+85
-481
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+85
-481
lines changed

‎.evergreen/config/generate-config.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
'5.0',
2020
'4.4',
2121
'4.2',
22-
'4.0',
2322
];
2423

2524
// TODO: Change when PHP 8.4 is stable

‎.evergreen/config/generated/test-variant/libmongoc.yml

Lines changed: 12 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.evergreen/config/generated/test-variant/php-full.yml

Lines changed: 32 additions & 32 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.evergreen/config/generated/test/local.yml

Lines changed: 0 additions & 58 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.evergreen/config/templates/test-variant/libmongoc.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
- variant: "build-debian12"
1111
name: "build-php-%phpVersion%-libmongoc-lowest-supported"
1212
tasks:
13-
- ".standalone .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
14-
- ".replicaset .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
15-
- ".sharded .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
16-
- ".loadbalanced .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
13+
- ".standalone .local !.4.2 !.4.4 !.5.0 !.6.0"
14+
- ".replicaset .local !.4.2 !.4.4 !.5.0 !.6.0"
15+
- ".sharded .local !.4.2 !.4.4 !.5.0 !.6.0"
16+
- ".loadbalanced .local !.4.2 !.4.4 !.5.0 !.6.0"
1717
- "test-atlas-connectivity"
1818
- ".ocsp !.4.4 !.5.0 !.6.0"
1919
display_tasks:
@@ -41,10 +41,10 @@
4141
- variant: "build-debian12"
4242
name: "build-php-%phpVersion%-libmongoc-next-stable"
4343
tasks:
44-
- ".standalone .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
45-
- ".replicaset .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
46-
- ".sharded .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
47-
- ".loadbalanced .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
44+
- ".standalone .local !.4.2 !.4.4 !.5.0 !.6.0"
45+
- ".replicaset .local !.4.2 !.4.4 !.5.0 !.6.0"
46+
- ".sharded .local !.4.2 !.4.4 !.5.0 !.6.0"
47+
- ".loadbalanced .local !.4.2 !.4.4 !.5.0 !.6.0"
4848
- "test-atlas-connectivity"
4949
- ".ocsp !.4.4 !.5.0 !.6.0"
5050
display_tasks:
@@ -72,10 +72,10 @@
7272
- variant: "build-debian12"
7373
name: "build-php-%phpVersion%-libmongoc-latest"
7474
tasks:
75-
- ".standalone .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
76-
- ".replicaset .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
77-
- ".sharded .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
78-
- ".loadbalanced .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
75+
- ".standalone .local !.4.2 !.4.4 !.5.0 !.6.0"
76+
- ".replicaset .local !.4.2 !.4.4 !.5.0 !.6.0"
77+
- ".sharded .local !.4.2 !.4.4 !.5.0 !.6.0"
78+
- ".loadbalanced .local !.4.2 !.4.4 !.5.0 !.6.0"
7979
- "test-atlas-connectivity"
8080
- ".ocsp !.4.4 !.5.0 !.6.0"
8181
display_tasks:

‎.evergreen/config/templates/test-variant/php-full.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
- variant: "build-debian12"
1111
name: "build-php-%phpVersion%"
1212
tasks:
13-
- ".standalone .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
14-
- ".replicaset .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
15-
- ".sharded .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
16-
- ".loadbalanced .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
13+
- ".standalone .local !.4.2 !.4.4 !.5.0 !.6.0"
14+
- ".replicaset .local !.4.2 !.4.4 !.5.0 !.6.0"
15+
- ".sharded .local !.4.2 !.4.4 !.5.0 !.6.0"
16+
- ".loadbalanced .local !.4.2 !.4.4 !.5.0 !.6.0"
1717
- ".ocsp !.4.4 !.5.0 !.6.0"
1818
- "test-atlas-connectivity"
1919
display_tasks:
@@ -43,10 +43,10 @@
4343
name: "build-php-%phpVersion%"
4444
tasks:
4545
# Remember to add new major versions here as they are released
46-
- ".standalone .local !.4.0 !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest"
47-
- ".replicaset .local !.4.0 !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest"
48-
- ".sharded .local !.4.0 !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest"
49-
- ".loadbalanced .local !.4.0 !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest"
46+
- ".standalone .local !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest"
47+
- ".replicaset .local !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest"
48+
- ".sharded .local !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest"
49+
- ".loadbalanced .local !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest"
5050
- ".ocsp !.4.4 !.7.0 !.8.0 !.rapid !.latest"
5151
display_tasks:
5252
- name: "test-ocsp-6.0"

‎.evergreen/config/test-tasks.yml

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,3 @@ tasks:
1313
- func: "run tests"
1414
vars:
1515
TESTS: "tests/atlas.phpt"
16-
17-
# Test different storage engines
18-
- name: "test-mongodb-4.0-standalone-inmemory"
19-
tags: ["standalone", "local", "4.0", "storage-engines"]
20-
commands:
21-
- func: "bootstrap mongo-orchestration"
22-
vars:
23-
TOPOLOGY: "server"
24-
MONGODB_VERSION: "4.0"
25-
STORAGE_ENGINE: "inmemory"
26-
- func: "run tests"
27-
- name: "test-mongodb-4.0-standalone-mmapv1"
28-
tags: ["standalone", "local", "4.0", "storage-engines"]
29-
commands:
30-
- func: "bootstrap mongo-orchestration"
31-
vars:
32-
TOPOLOGY: "server"
33-
MONGODB_VERSION: "4.0"
34-
STORAGE_ENGINE: "mmapv1"
35-
- func: "run tests"

‎tests/apm/commandFailedEvent-getServerConnectionId-001.phpt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ MongoDB\Driver\Monitoring\CommandFailedEvent includes serverConnectionId for 4.2
33
--SKIPIF--
44
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
55
<?php skip_if_not_live(); ?>
6-
<?php skip_if_server_version('<', '4.2'); ?>
76
--FILE--
87
<?php
98
require_once __DIR__ . "/../utils/basic.inc";

‎tests/apm/commandFailedEvent-getServerConnectionId-002.phpt

Lines changed: 0 additions & 48 deletions
This file was deleted.

‎tests/apm/commandStartedEvent-getServerConnectionId-001.phpt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ MongoDB\Driver\Monitoring\CommandStartedEvent includes serverConnectionId for 4.
33
--SKIPIF--
44
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
55
<?php skip_if_not_live(); ?>
6-
<?php skip_if_server_version('<', '4.2'); ?>
76
--FILE--
87
<?php
98
require_once __DIR__ . "/../utils/basic.inc";

0 commit comments

Comments
 (0)