Skip to content

Commit 8048e1a

Browse files
authored
PHPLIB-565: Add MongoDB version axis to build matrix (#780)
* Allow overriding default cluster configurations * Make phpunit output less verbose * Use latest stable driver version * Expand test matrix to test against all driver and server versions * Add secondary servers to cluster replica set * Make explain command check more forgiving * Don't drop collections in admin database for spec tests * Test against all topologies by default * Use majority write concern when inserting external keyvault data
1 parent 7bb5c36 commit 8048e1a

40 files changed

+97
-866
lines changed

.evergreen/config.yml

Lines changed: 31 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ functions:
174174
params:
175175
script: |
176176
${PREPARE_SHELL}
177-
MONGODB_VERSION=${VERSION} TOPOLOGY=${TOPOLOGY} AUTH=${AUTH} SSL=${SSL} STORAGE_ENGINE=${STORAGE_ENGINE} sh ${DRIVERS_TOOLS}/.evergreen/run-orchestration.sh
177+
MONGODB_VERSION=${VERSION} ORCHESTRATION_FILE=${ORCHESTRATION_FILE} TOPOLOGY=${TOPOLOGY} AUTH=${AUTH} SSL=${SSL} STORAGE_ENGINE=${STORAGE_ENGINE} sh ${PROJECT_DIRECTORY}/.evergreen/run-orchestration.sh
178178
# run-orchestration generates expansion file with the MONGODB_URI for the cluster
179179
- command: expansions.update
180180
params:
@@ -417,9 +417,7 @@ axes:
417417
display_name: Driver Version
418418
values:
419419
- id: "latest-stable"
420-
display_name: "1.8.0beta2"
421-
variables:
422-
DRIVER_VERSION: "1.8.0beta2"
420+
display_name: "1.8-stable"
423421
- id: "latest-minor-dev"
424422
display_name: "1.8-dev"
425423
variables:
@@ -507,10 +505,35 @@ axes:
507505

508506
buildvariants:
509507

510-
- matrix_name: "test-baseline"
511-
matrix_spec: {"os-php7": ["debian92-test", "ubuntu1804-arm64-test", "rhel70-test"], "php-versions": "*", "versions": "4.4", "driver-versions": "latest-stable" }
508+
# Tests all PHP versions on all operating systems.
509+
# Only tests against latest MongoDB and ext-mongodb versions
510+
- matrix_name: "test-php-versions"
511+
matrix_spec: {"os-php7": ["debian92-test", "ubuntu1804-arm64-test", "rhel70-test"], "php-versions": "*", "edge-versions": "latest-stable", "driver-versions": "latest-stable" }
512512
exclude_spec:
513-
- { "os-php7": ["debian92-test", "rhel70-test"], "php-versions": "7.0", versions: "*", "driver-versions": "*" }
514-
display_name: "${os-php7}, PHP ${php-versions}, MongoDB ${versions}, ext-mongodb ${driver-versions}"
513+
- { "os-php7": ["debian92-test", "rhel70-test"], "php-versions": "7.0", edge-versions: "*", "driver-versions": "*" }
514+
display_name: "PHP ${php-versions}, ${os-php7}, MongoDB ${edge-versions}, ext-mongodb ${driver-versions}"
515515
tasks:
516516
- name: "test-standalone"
517+
- name: "test-replica_set"
518+
- name: "test-sharded_cluster"
519+
520+
# Tests all driver versions on all PHP versions
521+
# Only tests on Ubuntu 18.04 and latest MongoDB
522+
- matrix_name: "test-driver-versions"
523+
matrix_spec: {"os-php7": "ubuntu1804-arm64-test", "php-versions": "*", "edge-versions": "latest-stable", "driver-versions": "*" }
524+
display_name: "ext-mongodb ${driver-versions}, PHP ${php-versions}, ${os-php7}, MongoDB ${edge-versions}"
525+
tasks:
526+
- name: "test-standalone"
527+
- name: "test-replica_set"
528+
- name: "test-sharded_cluster"
529+
530+
# Tests all MongoDB versions
531+
# Only tests on Ubuntu 18.04, with latest stable PHP and driver versions
532+
# Tests against various topologies
533+
- matrix_name: "test-mongodb-versions"
534+
matrix_spec: {"os-php7": "rhel70-test", "php-edge-versions": "latest-stable", "versions": "*", "driver-versions": "latest-stable" }
535+
display_name: "MongoDB ${versions}, PHP ${php-edge-versions}, ${os-php7}, ext-mongodb ${driver-versions}"
536+
tasks:
537+
- name: "test-standalone"
538+
- name: "test-replica_set"
539+
- name: "test-sharded_cluster"

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

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

.evergreen/orchestration/configs/replica_sets/auth.json

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

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

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

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

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

.evergreen/orchestration/configs/replica_sets/disableTestCommands.json

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

.evergreen/orchestration/configs/replica_sets/mmapv1.json

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

.evergreen/orchestration/configs/servers/README.md

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

.evergreen/orchestration/configs/servers/auth-aws.json

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

0 commit comments

Comments
 (0)