Skip to content

PHPLIB-565: Add MongoDB version axis to build matrix #780

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 9 commits into from
Sep 7, 2020
Merged
Show file tree
Hide file tree
Changes from all 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
39 changes: 31 additions & 8 deletions .evergreen/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ functions:
params:
script: |
${PREPARE_SHELL}
MONGODB_VERSION=${VERSION} TOPOLOGY=${TOPOLOGY} AUTH=${AUTH} SSL=${SSL} STORAGE_ENGINE=${STORAGE_ENGINE} sh ${DRIVERS_TOOLS}/.evergreen/run-orchestration.sh
MONGODB_VERSION=${VERSION} ORCHESTRATION_FILE=${ORCHESTRATION_FILE} TOPOLOGY=${TOPOLOGY} AUTH=${AUTH} SSL=${SSL} STORAGE_ENGINE=${STORAGE_ENGINE} sh ${PROJECT_DIRECTORY}/.evergreen/run-orchestration.sh
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using our own file allows us to add logic to override the used file. Passing ORCHESTRATION_FILE as well allows configurations to select a specific file instead of relying on the filename being assembled by the logic included.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was this borrowed from PHPC or is it new for PHPLIB (in which case it may be something you'd like to add back to PHPC)?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't find ORCHESTRATION_FILE in https://github.com/mongodb/mongo-php-driver/blob/master/.evergreen/config.yml, so I assume this is new. Feel free to create a ticket if you think it's worth porting this over to PHPC down the line.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Created PHPC-1676 to track this.

# run-orchestration generates expansion file with the MONGODB_URI for the cluster
- command: expansions.update
params:
Expand Down Expand Up @@ -417,9 +417,7 @@ axes:
display_name: Driver Version
values:
- id: "latest-stable"
display_name: "1.8.0beta2"
variables:
DRIVER_VERSION: "1.8.0beta2"
display_name: "1.8-stable"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was left over from earlier tests where we didn't have 1.8 stable yet. We can now omit the DRIVER_VERSION constant to always install the current stable release.

- id: "latest-minor-dev"
display_name: "1.8-dev"
variables:
Expand Down Expand Up @@ -507,10 +505,35 @@ axes:

buildvariants:

- matrix_name: "test-baseline"
matrix_spec: {"os-php7": ["debian92-test", "ubuntu1804-arm64-test", "rhel70-test"], "php-versions": "*", "versions": "4.4", "driver-versions": "latest-stable" }
# Tests all PHP versions on all operating systems.
# Only tests against latest MongoDB and ext-mongodb versions
- matrix_name: "test-php-versions"
matrix_spec: {"os-php7": ["debian92-test", "ubuntu1804-arm64-test", "rhel70-test"], "php-versions": "*", "edge-versions": "latest-stable", "driver-versions": "latest-stable" }
exclude_spec:
- { "os-php7": ["debian92-test", "rhel70-test"], "php-versions": "7.0", versions: "*", "driver-versions": "*" }
display_name: "${os-php7}, PHP ${php-versions}, MongoDB ${versions}, ext-mongodb ${driver-versions}"
- { "os-php7": ["debian92-test", "rhel70-test"], "php-versions": "7.0", edge-versions: "*", "driver-versions": "*" }
display_name: "PHP ${php-versions}, ${os-php7}, MongoDB ${edge-versions}, ext-mongodb ${driver-versions}"
tasks:
- name: "test-standalone"
- name: "test-replica_set"
- name: "test-sharded_cluster"

# Tests all driver versions on all PHP versions
# Only tests on Ubuntu 18.04 and latest MongoDB
- matrix_name: "test-driver-versions"
matrix_spec: {"os-php7": "ubuntu1804-arm64-test", "php-versions": "*", "edge-versions": "latest-stable", "driver-versions": "*" }
display_name: "ext-mongodb ${driver-versions}, PHP ${php-versions}, ${os-php7}, MongoDB ${edge-versions}"
tasks:
- name: "test-standalone"
- name: "test-replica_set"
- name: "test-sharded_cluster"

# Tests all MongoDB versions
# Only tests on Ubuntu 18.04, with latest stable PHP and driver versions
# Tests against various topologies
- matrix_name: "test-mongodb-versions"
matrix_spec: {"os-php7": "rhel70-test", "php-edge-versions": "latest-stable", "versions": "*", "driver-versions": "latest-stable" }
display_name: "MongoDB ${versions}, PHP ${php-edge-versions}, ${os-php7}, ext-mongodb ${driver-versions}"
tasks:
- name: "test-standalone"
- name: "test-replica_set"
- name: "test-sharded_cluster"
54 changes: 0 additions & 54 deletions .evergreen/orchestration/configs/replica_sets/auth-ssl.json

This file was deleted.

48 changes: 0 additions & 48 deletions .evergreen/orchestration/configs/replica_sets/auth.json

This file was deleted.

52 changes: 0 additions & 52 deletions .evergreen/orchestration/configs/replica_sets/basic-ssl.json

This file was deleted.

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

This file was deleted.

This file was deleted.

48 changes: 0 additions & 48 deletions .evergreen/orchestration/configs/replica_sets/mmapv1.json

This file was deleted.

5 changes: 0 additions & 5 deletions .evergreen/orchestration/configs/servers/README.md

This file was deleted.

15 changes: 0 additions & 15 deletions .evergreen/orchestration/configs/servers/auth-aws.json

This file was deleted.

Loading