From f6f26bfad675ae5c27a0fc823cdc44461709df85 Mon Sep 17 00:00:00 2001 From: Jonathan Reams Date: Mon, 26 Feb 2024 16:52:11 -0500 Subject: [PATCH 1/3] Add X86 Windows Release builder to evergreen --- evergreen/config.yml | 45 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 42 insertions(+), 3 deletions(-) diff --git a/evergreen/config.yml b/evergreen/config.yml index 06b0db98da6..533f040bfea 100644 --- a/evergreen/config.yml +++ b/evergreen/config.yml @@ -149,11 +149,18 @@ functions: set_cmake_var generator_vars CMAKE_MAKE_PROGRAM PATH "${ninja|ninja}" fi + if [ -n "${cmake_generator_platform|}" ]; then + set_cmake_var realm_vars CMAKE_GENERATOR_PLATFORM STRING "${cmake_generator_platform}" + fi + if [ -n "${curl_base|}" ]; then set_cmake_var curl_vars CURL_LIBRARY PATH "$(./evergreen/abspath.sh ${curl_base}/lib/curl.lib)" set_cmake_var curl_vars CURL_INCLUDE_DIR PATH "$(./evergreen/abspath.sh ${curl_base}/include)" + set_cmake_var baas_vars REALM_CURL_CACERTS PATH "$(./evergreen/abspath.sh "${curl_base}/bin/cacert.pem")" fi + set_cmake_var realm_vars REALM_NO_TESTS BOOL ${no_tests|Off} + echo "Running cmake with these vars:" cat cmake_vars/*.txt | tee cmake_vars.txt echo @@ -906,7 +913,7 @@ tasks: test_filter: CoreTests - name: core-tests - tags: [ "test_suite", "for_pull_requests" ] + tags: [ "test_suite", "for_pull_requests", "local_tests" ] exec_timeout_secs: 1800 commands: - func: "compile" @@ -942,7 +949,7 @@ tasks: benchmark_name: sync - name: sync-tests - tags: [ "test_suite", "for_pull_requests" ] + tags: [ "test_suite", "for_pull_requests", "local_tests" ] exec_timeout_secs: 1800 commands: - func: "compile" @@ -955,7 +962,7 @@ tasks: # These are local object store tests; baas is not started, however some use the sync server - name: object-store-tests - tags: [ "object_store_test_suite", "for_pull_requests" ] + tags: [ "object_store_test_suite", "for_pull_requests", "local_tests" ] exec_timeout_secs: 3600 commands: - func: "compile" @@ -1194,6 +1201,21 @@ task_groups: - .object_store_test_suite - package +# Runs core/sync/local object store tests +- name: compile_local_tests + max_hosts: 1 + setup_group_can_fail_task: true + setup_group: + - func: "fetch source" + - func: "fetch binaries" + teardown_task: + - func: "upload test results" + timeout: + - func: "run hang analyzer" + tasks: + - compile + - .local_tests + # Runs object-store-tests against baas running on remote host - name: compile_test max_hosts: 1 @@ -1839,3 +1861,20 @@ buildvariants: python3: "/cygdrive/c/python/python37/python.exe" tasks: - name: compile_test + +- name: windows-x86-release + display_name: "Windows X86 (Release)" + run_on: windows-vsCurrent-large + expansions: + cmake_url: "https://s3.amazonaws.com/static.realm.io/evergreen-assets/cmake-3.26.3-windows-x86_64.zip" + cmake_bindir: "./cmake-3.26.3-windows-x86_64/bin" + cmake_generator: "Visual Studio 16 2019" + cmake_generator_platform: "Win32" + cmake_build_type: "Release" + max_jobs: $(($(grep -c proc /proc/cpuinfo) / 2)) + fetch_missing_dependencies: On + python3: "/cygdrive/c/python/python37/python.exe" + disable_tests_against_baas: On + tasks: + - name: compile_local_tests + From f872d021acf3595685cb3db8b823cb23a1d7f292 Mon Sep 17 00:00:00 2001 From: Jonathan Reams Date: Mon, 26 Feb 2024 22:41:49 -0500 Subject: [PATCH 2/3] re-use tag --- evergreen/config.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/evergreen/config.yml b/evergreen/config.yml index 533f040bfea..c32d34bb46a 100644 --- a/evergreen/config.yml +++ b/evergreen/config.yml @@ -913,7 +913,7 @@ tasks: test_filter: CoreTests - name: core-tests - tags: [ "test_suite", "for_pull_requests", "local_tests" ] + tags: [ "test_suite", "for_pull_requests" ] exec_timeout_secs: 1800 commands: - func: "compile" @@ -949,7 +949,7 @@ tasks: benchmark_name: sync - name: sync-tests - tags: [ "test_suite", "for_pull_requests", "local_tests" ] + tags: [ "test_suite", "for_pull_requests" ] exec_timeout_secs: 1800 commands: - func: "compile" @@ -962,7 +962,7 @@ tasks: # These are local object store tests; baas is not started, however some use the sync server - name: object-store-tests - tags: [ "object_store_test_suite", "for_pull_requests", "local_tests" ] + tags: [ "object_store_test_suite", "for_pull_requests", "test_suite" ] exec_timeout_secs: 3600 commands: - func: "compile" @@ -1214,7 +1214,7 @@ task_groups: - func: "run hang analyzer" tasks: - compile - - .local_tests + - .test_suite # Runs object-store-tests against baas running on remote host - name: compile_test From de60480f3819083002a9b00e686a378fcbc01ff3 Mon Sep 17 00:00:00 2001 From: Jonathan Reams Date: Fri, 1 Mar 2024 07:55:45 -0500 Subject: [PATCH 3/3] use tags in a valid way --- evergreen/config.yml | 27 ++++----------------------- 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/evergreen/config.yml b/evergreen/config.yml index c32d34bb46a..84348a32642 100644 --- a/evergreen/config.yml +++ b/evergreen/config.yml @@ -962,7 +962,7 @@ tasks: # These are local object store tests; baas is not started, however some use the sync server - name: object-store-tests - tags: [ "object_store_test_suite", "for_pull_requests", "test_suite" ] + tags: [ "for_pull_requests", "test_suite" ] exec_timeout_secs: 3600 commands: - func: "compile" @@ -977,7 +977,7 @@ tasks: # These are baas object store tests that run against baas running on a remote host - name: baas-integration-tests - tags: [ "object_store_test_suite", "for_pull_requests" ] + tags: [ "test_suite", "for_pull_requests", "requires_baas" ] exec_timeout_secs: 3600 commands: - func: "launch remote baas" @@ -1198,7 +1198,6 @@ task_groups: tasks: - compile - .test_suite - - .object_store_test_suite - package # Runs core/sync/local object store tests @@ -1214,7 +1213,7 @@ task_groups: - func: "run hang analyzer" tasks: - compile - - .test_suite + - ".test_suite !.requires_baas" # Runs object-store-tests against baas running on remote host - name: compile_test @@ -1231,23 +1230,6 @@ task_groups: tasks: - compile - .test_suite - - .object_store_test_suite - -# compile and run only object store tests: local and remote -- name: compile_test_object_store - max_hosts: 1 - setup_group_can_fail_task: true - setup_group: - - func: "fetch source" - - func: "fetch binaries" - teardown_task: - - func: "upload test results" - - func: "upload baas artifacts" - timeout: - - func: "run hang analyzer" - tasks: - - compile - - .object_store_test_suite # Runs object-store-tests against baas running on remote host and runs # the network simulation tests as a separate task for nightly builds @@ -1280,7 +1262,6 @@ task_groups: tasks: - compile - .test_suite - - .object_store_test_suite - process_coverage_data - name: benchmarks @@ -1761,7 +1742,7 @@ buildvariants: tasks: # FIXME: tsan is not stable on arm64, fails often with internal errors # - name: compile_test - - name: compile_test_object_store + - name: compile_test - name: macos-coverage display_name: "MacOS 11 arm64 (Code Coverage)"