Skip to content

Commit dbb5940

Browse files
authored
PHPLIB-868: Add MongoDB 5.0 to load balancer CI matrix (#932)
Also removes remnants of service ID mocking (PHPC-2053).
1 parent 8f2e921 commit dbb5940

File tree

2 files changed

+2
-11
lines changed

2 files changed

+2
-11
lines changed

.evergreen/config.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ functions:
247247
export KMS_TLS_CA_FILE="${client_side_encryption_kms_tls_ca_file}"
248248
export KMS_TLS_CERTIFICATE_KEY_FILE="${client_side_encryption_kms_tls_certificate_key_file}"
249249
export PATH="${PHP_PATH}/bin:$PATH"
250-
MOCK_SERVICE_ID=${MOCK_SERVICE_ID} API_VERSION=${API_VERSION} PHP_VERSION=${PHP_VERSION} AUTH=${AUTH} SSL=${SSL} MONGODB_URI="${MONGODB_URI}" sh ${PROJECT_DIRECTORY}/.evergreen/run-tests.sh
250+
API_VERSION=${API_VERSION} PHP_VERSION=${PHP_VERSION} AUTH=${AUTH} SSL=${SSL} MONGODB_URI="${MONGODB_URI}" sh ${PROJECT_DIRECTORY}/.evergreen/run-tests.sh
251251
252252
"run atlas data lake test":
253253
- command: shell.exec
@@ -752,9 +752,7 @@ buildvariants:
752752
- .serverless
753753

754754
- matrix_name: "test-loadBalanced"
755-
# TODO: Add "5.2" server version alongside "latest" following its GA release
756-
# TODO: Revert driver-version to latest-stable after PHPC 1.13.0 is released (for CDRIVER-4207)
757-
matrix_spec: { "versions": "latest", "php-edge-versions": "latest-stable", "driver-versions": "latest-dev" }
755+
matrix_spec: { "versions": ["5.0", "latest"], "php-edge-versions": "latest-stable", "driver-versions": "latest-stable" }
758756
display_name: "Load balanced - ${versions}"
759757
run_on: debian92-test
760758
tasks:

.evergreen/run-tests.sh

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,11 @@ set -o errexit # Exit the script with error if any of the commands fail
66
# MONGODB_URI Set the suggested connection MONGODB_URI (including credentials and topology info)
77
# API_VERSION Optional API_VERSION environment variable for run-tests.php
88
# IS_MATRIX_TESTING Set to "true" to enable matrix testing. Defaults to empty string. If "true", DRIVER_MONGODB_VERSION and MONGODB_VERSION will also be checked.
9-
# MOCK_SERVICE_ID Set to "1" to enable service ID mocking for load balancers. Defaults to empty string.
109

1110
SSL=${SSL:-nossl}
1211
MONGODB_URI=${MONGODB_URI:-}
1312
API_VERSION=${API_VERSION:-}
1413
IS_MATRIX_TESTING=${IS_MATRIX_TESTING:-}
15-
MOCK_SERVICE_ID=${MOCK_SERVICE_ID:-}
1614

1715
# For matrix testing, we have to determine the correct driver version
1816
if [ "${IS_MATRIX_TESTING}" = "true" ]; then
@@ -46,11 +44,6 @@ fi
4644
# Enable verbose output to see skipped and incomplete tests
4745
PHPUNIT_OPTS="${PHPUNIT_OPTS} -v"
4846

49-
# For load balancer testing, we need to enable service ID mocking
50-
if [ "${MOCK_SERVICE_ID}" = "1" ]; then
51-
PHPUNIT_OPTS="${PHPUNIT_OPTS} -d mongodb.mock_service_id=1"
52-
fi
53-
5447
# Determine if MONGODB_URI already has a query string
5548
SUFFIX=$(echo "$MONGODB_URI" | grep -Eo "\?(.*)" | cat)
5649

0 commit comments

Comments
 (0)