From dd1756c3ec6277407cc3df7bdbbf43142922f006 Mon Sep 17 00:00:00 2001 From: Ezra Chung Date: Thu, 20 Jul 2023 13:37:54 -0500 Subject: [PATCH 1/5] Address EVG warning due to lack of exec_timeout_secs --- .mci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.mci.yml b/.mci.yml index 3b5629de58..11c359b377 100644 --- a/.mci.yml +++ b/.mci.yml @@ -2,6 +2,8 @@ # CXX Driver Config for MCI # ####################################### +exec_timeout_secs: 3600 + ####################################### # Variables # ####################################### From 8b5aa609f628b6f3bf4738ca7b13ab6c429c77bb Mon Sep 17 00:00:00 2001 From: Ezra Chung Date: Thu, 20 Jul 2023 13:51:15 -0500 Subject: [PATCH 2/5] Address EVG warning due to duplicate variant display names --- .mci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mci.yml b/.mci.yml index 11c359b377..4aa4ce7806 100644 --- a/.mci.yml +++ b/.mci.yml @@ -1611,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 From 8c2d5930d6f234c779bb1a03d25be1eb6e6ab72f Mon Sep 17 00:00:00 2001 From: Ezra Chung Date: Thu, 20 Jul 2023 13:44:09 -0500 Subject: [PATCH 3/5] Fix EVG warning due to invalid placement of matrix expansions --- .mci.yml | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/.mci.yml b/.mci.yml index 4aa4ce7806..ec3f9ea2f6 100644 --- a/.mci.yml +++ b/.mci.yml @@ -1195,6 +1195,11 @@ axes: variables: mongodb_version: *version_40 + - id: with_mongocryptd + values: + - id: "yes" + variables: {use_mongocryptd: true} + ####################################### # Buildvariants # @@ -1230,6 +1235,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"], with_mongocryptd: "yes"} + 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 # ####################################### @@ -1367,19 +1381,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: From f2b0856e4077bfa09a9ee3ce968869824103c799 Mon Sep 17 00:00:00 2001 From: Ezra Chung Date: Thu, 20 Jul 2023 13:36:34 -0500 Subject: [PATCH 4/5] CXX-2661 Remove tasks on macos-1014 --- .mci.yml | 46 ---------------------------------------------- 1 file changed, 46 deletions(-) diff --git a/.mci.yml b/.mci.yml index ec3f9ea2f6..5785d9c366 100644 --- a/.mci.yml +++ b/.mci.yml @@ -1809,52 +1809,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: From 8f51c65590c88fe111ba1e120599b5a28e10e97f Mon Sep 17 00:00:00 2001 From: Ezra Chung Date: Thu, 20 Jul 2023 16:46:18 -0500 Subject: [PATCH 5/5] Reuse matrix spec to define use_mongocryptd --- .mci.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.mci.yml b/.mci.yml index 5785d9c366..48639838be 100644 --- a/.mci.yml +++ b/.mci.yml @@ -1195,10 +1195,9 @@ axes: variables: mongodb_version: *version_40 - - id: with_mongocryptd + - id: use_mongocryptd values: - - id: "yes" - variables: {use_mongocryptd: true} + - id: "true" ####################################### @@ -1238,7 +1237,7 @@ buildvariants: # 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"], with_mongocryptd: "yes"} + 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