Skip to content

Commit 93efe0a

Browse files
authored
PHPC-2073: Remove references to pre-3.6 servers (#1305)
* Remove pre-3.6 server versions from Evergreen matrix * Remove skipped tests for pre-3.6 servers * Remove old mongo-orchestration configs and Evergreen tasks * Remove flaky replica set tests These tests assume a particular replica set member is always the primary, so tag assertions may fail if a different member is elected. The server-getTags-002.phpt test has more flexible assertions for replica set tags, so we can safely remove these tests.
1 parent a25525e commit 93efe0a

File tree

145 files changed

+77
-1573
lines changed

Some content is hidden

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

145 files changed

+77
-1573
lines changed

.evergreen/config.yml

Lines changed: 3 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ functions:
8686
fi
8787
8888
export MONGO_ORCHESTRATION_HOME="$DRIVERS_TOOLS/.evergreen/orchestration"
89+
# Note: PHPC no longer has any custom MO configs, but they can be stored here if needed
8990
export PROJECT_ORCHESTRATION_HOME="$PROJECT_DIRECTORY/.evergreen/orchestration"
9091
export MONGODB_BINARIES="$DRIVERS_TOOLS/mongodb/bin"
9192
export UPLOAD_BUCKET="${project}"
@@ -547,16 +548,6 @@ tasks:
547548
vars:
548549
SSL: "yes"
549550

550-
- name: "test-standalone-old"
551-
tags: ["standalone"]
552-
commands:
553-
- func: "compile driver"
554-
- func: "bootstrap mongo-orchestration"
555-
vars:
556-
TOPOLOGY: "server"
557-
ORCHESTRATION_FILE: "standalone-old.json"
558-
- func: "run tests"
559-
560551
- name: "test-replicaset"
561552
tags: ["replicaset"]
562553
commands:
@@ -576,16 +567,6 @@ tasks:
576567
AUTH: "auth"
577568
- func: "run tests"
578569

579-
- name: "test-replicaset-old"
580-
tags: ["replicaset"]
581-
commands:
582-
- func: "compile driver"
583-
- func: "bootstrap mongo-orchestration"
584-
vars:
585-
TOPOLOGY: "replica_set"
586-
ORCHESTRATION_FILE: "replicaset-old.json"
587-
- func: "run tests"
588-
589570
- name: "test-sharded"
590571
tags: ["sharded"]
591572
commands:
@@ -1054,18 +1035,6 @@ axes:
10541035
display_name: "MongoDB 3.6"
10551036
variables:
10561037
VERSION: "3.6"
1057-
- id: "3.4"
1058-
display_name: "MongoDB 3.4"
1059-
variables:
1060-
VERSION: "3.4"
1061-
- id: "3.2"
1062-
display_name: "MongoDB 3.2"
1063-
variables:
1064-
VERSION: "3.2"
1065-
- id: "3.0"
1066-
display_name: "MongoDB 3.0"
1067-
variables:
1068-
VERSION: "3.0"
10691038

10701039
- id: edge-versions
10711040
display_name: MongoDB Version
@@ -1075,9 +1044,9 @@ axes:
10751044
variables:
10761045
VERSION: "4.4"
10771046
- id: "oldest-supported"
1078-
display_name: "MongoDB 3.0"
1047+
display_name: "MongoDB 3.6"
10791048
variables:
1080-
VERSION: "3.0"
1049+
VERSION: "3.6"
10811050

10821051
- id: php-versions
10831052
display_name: PHP Version
@@ -1189,18 +1158,6 @@ buildvariants:
11891158
- name: "test-standalone-ssl"
11901159
- name: "test-replicaset-auth"
11911160

1192-
# Tests pre-3.6 MongoDB versions with oldest supported PHP version
1193-
- matrix_name: "test-old-mongodb-versions"
1194-
matrix_spec: { "os": "*", "versions": ["3.0", "3.2", "3.4"], "php-edge-versions": "oldest-supported" }
1195-
exclude_spec:
1196-
- { "os": "ubuntu1804-arm64", "versions": "*", "php-edge-versions": "oldest-supported" }
1197-
- { "os": "rhel71-power8", "versions": "3.0", "php-edge-versions": "oldest-supported" }
1198-
- { "os": "rhel74-zseries", "versions": ["3.0", "3.2"], "php-edge-versions": "oldest-supported" }
1199-
display_name: "${os}, ${versions}, ${php-edge-versions}"
1200-
tasks:
1201-
- name: "test-standalone-old"
1202-
- name: "test-replicaset-old"
1203-
12041161
# Tests MongoDB 3.6 with oldest supported PHP version
12051162
- matrix_name: "test-mongodb-36"
12061163
matrix_spec: { "os": "*", "versions": ["3.6"], "php-edge-versions": "oldest-supported" }

.evergreen/orchestration/configs/replica_sets/basic-ssl.json

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

.evergreen/orchestration/configs/replica_sets/basic.json

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

.evergreen/orchestration/configs/replica_sets/replicaset-old.json

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

.evergreen/orchestration/configs/servers/standalone-old.json

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

tests/apm/commandFailedEvent-getReply-001.phpt

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

tests/apm/commandStartedEvent-002.phpt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ MongoDB\Driver\Monitoring\CommandStartedEvent during mongoc_client_destroy()
44
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
55
<?php skip_if_not_libmongoc_crypto(); ?>
66
<?php skip_if_not_live(); ?>
7-
<?php skip_if_server_version('<', '3.6'); ?>
87
--FILE--
98
<?php
109
require_once __DIR__ . "/../utils/basic.inc";

tests/bulk/bulkwrite-debug-002.phpt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ MongoDB\Driver\BulkWrite debug output after execution
33
--SKIPIF--
44
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
55
<?php skip_if_not_live(); ?>
6-
<?php skip_if_server_version('<', '3.6'); ?>
76
<?php skip_if_not_clean(); ?>
87
--FILE--
98
<?php

tests/bulk/bulkwrite-delete_error-004.phpt

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

tests/bulk/bulkwrite-delete_error-005.phpt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ MongoDB\Driver\BulkWrite::delete() hint option requires MongoDB 4.4 (server-side
44
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
55
<?php skip_if_not_live(); ?>
66
<?php skip_if_server_version('>=', '4.3.4'); ?>
7-
<?php skip_if_server_version('<=', '3.6.0'); ?>
87
--FILE--
98
<?php
109
require_once __DIR__ . "/../utils/basic.inc";

tests/bulk/bulkwrite-update-002.phpt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ MongoDB\Driver\BulkWrite::update() with arrayFilters option
33
--SKIPIF--
44
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
55
<?php skip_if_not_live(); ?>
6-
<?php skip_if_server_version('<', '3.6'); ?>
76
<?php skip_if_not_clean(); ?>
87
--FILE--
98
<?php

tests/bulk/bulkwrite-update_error-006.phpt

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

tests/bulk/bulkwrite-update_error-007.phpt

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

0 commit comments

Comments
 (0)