Skip to content

PHPC-2073: Remove references to pre-3.6 servers #1305

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Mar 2, 2022
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 3 additions & 46 deletions .evergreen/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ functions:
fi

export MONGO_ORCHESTRATION_HOME="$DRIVERS_TOOLS/.evergreen/orchestration"
# Note: PHPC no longer has any custom MO configs, but they can be stored here if needed
export PROJECT_ORCHESTRATION_HOME="$PROJECT_DIRECTORY/.evergreen/orchestration"
export MONGODB_BINARIES="$DRIVERS_TOOLS/mongodb/bin"
export UPLOAD_BUCKET="${project}"
Expand Down Expand Up @@ -547,16 +548,6 @@ tasks:
vars:
SSL: "yes"

- name: "test-standalone-old"
tags: ["standalone"]
commands:
- func: "compile driver"
- func: "bootstrap mongo-orchestration"
vars:
TOPOLOGY: "server"
ORCHESTRATION_FILE: "standalone-old.json"
- func: "run tests"

- name: "test-replicaset"
tags: ["replicaset"]
commands:
Expand All @@ -576,16 +567,6 @@ tasks:
AUTH: "auth"
- func: "run tests"

- name: "test-replicaset-old"
tags: ["replicaset"]
commands:
- func: "compile driver"
- func: "bootstrap mongo-orchestration"
vars:
TOPOLOGY: "replica_set"
ORCHESTRATION_FILE: "replicaset-old.json"
- func: "run tests"

- name: "test-sharded"
tags: ["sharded"]
commands:
Expand Down Expand Up @@ -1054,18 +1035,6 @@ axes:
display_name: "MongoDB 3.6"
variables:
VERSION: "3.6"
- id: "3.4"
display_name: "MongoDB 3.4"
variables:
VERSION: "3.4"
- id: "3.2"
display_name: "MongoDB 3.2"
variables:
VERSION: "3.2"
- id: "3.0"
display_name: "MongoDB 3.0"
variables:
VERSION: "3.0"

- id: edge-versions
display_name: MongoDB Version
Expand All @@ -1075,9 +1044,9 @@ axes:
variables:
VERSION: "4.4"
- id: "oldest-supported"
display_name: "MongoDB 3.0"
display_name: "MongoDB 3.6"
variables:
VERSION: "3.0"
VERSION: "3.6"

- id: php-versions
display_name: PHP Version
Expand Down Expand Up @@ -1189,18 +1158,6 @@ buildvariants:
- name: "test-standalone-ssl"
- name: "test-replicaset-auth"

# Tests pre-3.6 MongoDB versions with oldest supported PHP version
- matrix_name: "test-old-mongodb-versions"
matrix_spec: { "os": "*", "versions": ["3.0", "3.2", "3.4"], "php-edge-versions": "oldest-supported" }
exclude_spec:
- { "os": "ubuntu1804-arm64", "versions": "*", "php-edge-versions": "oldest-supported" }
- { "os": "rhel71-power8", "versions": "3.0", "php-edge-versions": "oldest-supported" }
- { "os": "rhel74-zseries", "versions": ["3.0", "3.2"], "php-edge-versions": "oldest-supported" }
display_name: "${os}, ${versions}, ${php-edge-versions}"
tasks:
- name: "test-standalone-old"
- name: "test-replicaset-old"

# Tests MongoDB 3.6 with oldest supported PHP version
- matrix_name: "test-mongodb-36"
matrix_spec: { "os": "*", "versions": ["3.6"], "php-edge-versions": "oldest-supported" }
Expand Down
51 changes: 0 additions & 51 deletions .evergreen/orchestration/configs/replica_sets/basic-ssl.json

This file was deleted.

45 changes: 0 additions & 45 deletions .evergreen/orchestration/configs/replica_sets/basic.json

This file was deleted.

52 changes: 0 additions & 52 deletions .evergreen/orchestration/configs/replica_sets/replicaset-old.json

This file was deleted.

13 changes: 0 additions & 13 deletions .evergreen/orchestration/configs/servers/standalone-old.json

This file was deleted.

1 change: 0 additions & 1 deletion tests/apm/commandFailedEvent-getReply-001.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ MongoDB\Driver\Monitoring\CommandFailedEvent::getReply()
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php skip_if_not_live(); ?>
<?php skip_if_server_version('<', '3.4'); ?>
--FILE--
<?php
require_once __DIR__ . "/../utils/basic.inc";
Expand Down
1 change: 0 additions & 1 deletion tests/apm/commandStartedEvent-002.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ MongoDB\Driver\Monitoring\CommandStartedEvent during mongoc_client_destroy()
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php skip_if_not_libmongoc_crypto(); ?>
<?php skip_if_not_live(); ?>
<?php skip_if_server_version('<', '3.6'); ?>
--FILE--
<?php
require_once __DIR__ . "/../utils/basic.inc";
Expand Down
1 change: 0 additions & 1 deletion tests/bulk/bulkwrite-debug-002.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ MongoDB\Driver\BulkWrite debug output after execution
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php skip_if_not_live(); ?>
<?php skip_if_server_version('<', '3.6'); ?>
<?php skip_if_not_clean(); ?>
--FILE--
<?php
Expand Down
30 changes: 0 additions & 30 deletions tests/bulk/bulkwrite-delete_error-004.phpt

This file was deleted.

1 change: 0 additions & 1 deletion tests/bulk/bulkwrite-delete_error-005.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ MongoDB\Driver\BulkWrite::delete() hint option requires MongoDB 4.4 (server-side
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php skip_if_not_live(); ?>
<?php skip_if_server_version('>=', '4.3.4'); ?>
<?php skip_if_server_version('<=', '3.6.0'); ?>
--FILE--
<?php
require_once __DIR__ . "/../utils/basic.inc";
Expand Down
1 change: 0 additions & 1 deletion tests/bulk/bulkwrite-update-002.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ MongoDB\Driver\BulkWrite::update() with arrayFilters option
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php skip_if_not_live(); ?>
<?php skip_if_server_version('<', '3.6'); ?>
<?php skip_if_not_clean(); ?>
--FILE--
<?php
Expand Down
31 changes: 0 additions & 31 deletions tests/bulk/bulkwrite-update_error-006.phpt

This file was deleted.

34 changes: 0 additions & 34 deletions tests/bulk/bulkwrite-update_error-007.phpt

This file was deleted.

Loading