Skip to content

CXX-2661 Remove tasks on macos-1014 #991

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.

Sign up for GitHub

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 5 commits into from
Jul 21, 2023
Merged

CXX-2661 Remove tasks on macos-1014 #991

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dd1756c
Address EVG warning due to lack of exec_timeout_secs
eramongodb Jul 20, 2023
8b5aa60
Address EVG warning due to duplicate variant display names
eramongodb Jul 20, 2023
8c2d593
Fix EVG warning due to invalid placement of matrix expansions
eramongodb Jul 20, 2023
f2b0856
CXX-2661 Remove tasks on macos-1014
eramongodb Jul 20, 2023
8f51c65
Reuse matrix spec to define use_mongocryptd
eramongodb Jul 20, 2023
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
76 changes: 16 additions & 60 deletions .mci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
# CXX Driver Config for MCI #
#######################################

exec_timeout_secs: 3600

#######################################
# Variables #
#######################################
Expand Down Expand Up @@ -1193,6 +1195,10 @@ axes:
variables:
mongodb_version: *version_40

- id: use_mongocryptd
values:
- id: "true"


#######################################
# Buildvariants #
Expand Down Expand Up @@ -1228,6 +1234,15 @@ buildvariants:
- name: test_versioned_api
- name: test_versioned_api_accept_version_two

# Add matrix for specification test requirement of mongocryptd:
# "Drivers MUST run all tests with mongocryptd on at least one platform for all tested server versions (4.2+)."
- matrix_name: "mongocryptd"
matrix_spec: {os: "ubuntu-1804", mongodb_version: ["4.2", "4.4", "5.0", "latest"], use_mongocryptd: "true"}
display_name: "${os} (MongoDB ${mongodb_version}) with mongocryptd"
tasks:
- name: compile_and_test_with_shared_libs
- name: compile_and_test_with_shared_libs_replica_set

#######################################
# Linux Buildvariants #
#######################################
Expand Down Expand Up @@ -1365,19 +1380,6 @@ buildvariants:
- debian10-large
- name: uninstall_check

# Add matrix for specification test requirement of mongocryptd:
# "Drivers MUST run all tests with mongocryptd on at least one platform for all tested server versions (4.2+)."
- matrix_name: "mongocryptd"
matrix_spec:
os: "ubuntu-1804"
mongodb_version: ["4.2", "4.4", "5.0", "latest"]
display_name: "${os} (MongoDB ${mongodb_version}) with mongocryptd"
tasks:
- name: compile_and_test_with_shared_libs
- name: compile_and_test_with_shared_libs_replica_set
expansions:
use_mongocryptd: true

- name: ubuntu2004-release-latest
display_name: "Ubuntu 20.04 Release (MongoDB Latest)"
expansions:
Expand Down Expand Up @@ -1609,7 +1611,7 @@ buildvariants:
- name: compile_and_test_with_static_libs

- name: ubuntu1804-debug
display_name: "Ubuntu 18.04 Debug (MongoDB Latest)"
display_name: "Ubuntu 18.04 Debug (MongoDB Latest) (Extra)"
expansions:
build_type: "Debug"
tar_options: *linux_tar_options
Expand Down Expand Up @@ -1806,52 +1808,6 @@ buildvariants:
#######################################
# Mac and Windows #
#######################################
- name: macos-1014-latest # CXX-2661: remove in favor of macos-1100.
display_name: "MacOS 10.14 Release (Boost) (MongoDB Latest)"
expansions:
build_type: "Release"
extra_path: *macos_extra_path
cmake_flags: *macos_cmake_flags
poly_flags: *poly_boost_flags
mongodb_version: *version_latest
run_on:
- macos-1014
tasks:
- name: compile_and_test_with_shared_libs
- name: compile_and_test_with_shared_libs_extra_alignment
- name: compile_and_test_with_static_libs
- name: compile_and_test_with_static_libs_extra_alignment

- name: macos-1014-50 # CXX-2661: remove in favor of macos-1100.
display_name: "MacOS 10.14 Release (Boost) (MongoDB 5.0)"
expansions:
build_type: "Release"
extra_path: *macos_extra_path
cmake_flags: *macos_cmake_flags
poly_flags: *poly_boost_flags
mongodb_version: *version_50
run_on:
- macos-1014
tasks:
- name: compile_and_test_with_shared_libs
- name: compile_and_test_with_shared_libs_extra_alignment
- name: compile_and_test_with_static_libs
- name: compile_and_test_with_static_libs_extra_alignment

- name: macos-1014-versioned-api # CXX-2661: remove in favor of macos-1100.
display_name: "MacOS 10.14 Release Versioned API"
expansions:
build_type: "Release"
extra_path: *macos_extra_path
cmake_flags: *macos_cmake_flags
poly_flags: *poly_boost_flags
mongodb_version: *version_latest
run_on:
- macos-1014
tasks:
- name: test_versioned_api
- name: test_versioned_api_accept_version_two

- name: macos-1100-latest
display_name: "MacOS 11.0 Release (Boost) (MongoDB Latest)"
expansions:
Expand Down