From 279a1fa56479ba7426a30be5aa57ee9ab6bc89cc Mon Sep 17 00:00:00 2001 From: Ezra Chung Date: Fri, 15 Nov 2024 14:09:33 -0600 Subject: [PATCH 1/5] Migrate from rhel83-zseries to rhel8-zeries --- .../components/cse/openssl.py | 10 +- .../components/sasl/openssl.py | 4 +- .evergreen/config_generator/etc/distros.py | 4 +- .../generated_configs/legacy-config.yml | 4 +- .evergreen/generated_configs/tasks.yml | 260 +++++++++--------- .evergreen/generated_configs/variants.yml | 28 +- .../evergreen_config_lib/variants.py | 4 +- 7 files changed, 157 insertions(+), 157 deletions(-) diff --git a/.evergreen/config_generator/components/cse/openssl.py b/.evergreen/config_generator/components/cse/openssl.py index 5968611d8e..3d988aa6e9 100644 --- a/.evergreen/config_generator/components/cse/openssl.py +++ b/.evergreen/config_generator/components/cse/openssl.py @@ -20,8 +20,8 @@ ('debian92', 'clang', None, ['cyrus']), ('debian92', 'gcc', None, ['cyrus']), ('rhel80', 'gcc', None, ['cyrus']), - ('rhel83-zseries', 'gcc', None, ['cyrus']), - ('ubuntu2004', 'clang', None, ['cyrus']), + ('rhel8-zseries', 'gcc', None, ['cyrus']), + ('ubuntu2004', 'clang', None, ['cyrus']), ('ubuntu2004', 'gcc', None, ['cyrus']), ('ubuntu2004-arm64', 'gcc', None, ['cyrus']), ('windows-vsCurrent', 'vs2017x64', None, ['cyrus']), @@ -29,14 +29,14 @@ # TODO (CDRIVER-3789): test cse with the 'sharded' topology. TEST_MATRIX = [ - # 4.2 and 4.4 not available on rhel83-zseries. - ('rhel83-zseries', 'gcc', None, 'cyrus', ['auth'], ['server'], ['5.0']), + # 4.2 and 4.4 not available on rhel8-zseries. + ('rhel8-zseries', 'gcc', None, 'cyrus', ['auth'], ['server'], ['5.0']), ('windows-vsCurrent', 'vs2017x64', None, 'cyrus', ['auth'], ['server'], ['4.2', '4.4', '5.0', '6.0' ]), # Test 7.0+ with a replica set since Queryable Encryption does not support the 'server' topology. Queryable Encryption tests require 7.0+. ('ubuntu2004', 'gcc', None, 'cyrus', ['auth'], ['server', 'replica'], ['4.4', '5.0', '6.0', '7.0', '8.0', 'latest']), - ('rhel83-zseries', 'gcc', None, 'cyrus', ['auth'], ['server', 'replica'], [ '7.0', '8.0', 'latest']), + ('rhel8-zseries', 'gcc', None, 'cyrus', ['auth'], ['server', 'replica'], [ '7.0', '8.0', 'latest']), ('ubuntu2004-arm64', 'gcc', None, 'cyrus', ['auth'], ['server', 'replica'], ['4.4', '5.0', '6.0', '7.0', '8.0', 'latest']), ('windows-vsCurrent', 'vs2017x64', None, 'cyrus', ['auth'], ['server', 'replica'], [ '7.0', '8.0', 'latest']), diff --git a/.evergreen/config_generator/components/sasl/openssl.py b/.evergreen/config_generator/components/sasl/openssl.py index 9eb009b5af..9f246c051f 100644 --- a/.evergreen/config_generator/components/sasl/openssl.py +++ b/.evergreen/config_generator/components/sasl/openssl.py @@ -23,7 +23,7 @@ ('debian92', 'gcc', None, ['cyrus']), ('rhel80', 'gcc', None, ['cyrus']), ('rhel81-power8', 'gcc', None, ['cyrus']), - ('rhel83-zseries', 'gcc', None, ['cyrus']), + ('rhel8-zseries', 'gcc', None, ['cyrus']), ('ubuntu2004', 'clang', None, ['cyrus']), ('ubuntu2004-arm64', 'gcc', None, ['cyrus']), ('ubuntu2004', 'gcc', None, ['cyrus']), @@ -32,7 +32,7 @@ TEST_MATRIX = [ ('rhel81-power8', 'gcc', None, 'cyrus', ['auth'], ['server', ], [ '4.2', '4.4', '5.0', '6.0', '7.0', '8.0', 'latest']), - ('rhel83-zseries', 'gcc', None, 'cyrus', ['auth'], ['server', ], [ '5.0', '6.0', '7.0', '8.0', 'latest']), + ('rhel8-zseries', 'gcc', None, 'cyrus', ['auth'], ['server', ], [ '5.0', '6.0', '7.0', '8.0', 'latest']), ('ubuntu2004-arm64', 'gcc', None, 'cyrus', ['auth'], ['server'], ['4.4', '5.0', '6.0', '7.0', '8.0', 'latest']), ('ubuntu2004', 'gcc', None, 'cyrus', ['auth'], ['server'], ['4.4', '5.0', '6.0', '7.0', '8.0', 'latest']), diff --git a/.evergreen/config_generator/etc/distros.py b/.evergreen/config_generator/etc/distros.py index 2c142b6a9b..e42ef2abe7 100644 --- a/.evergreen/config_generator/etc/distros.py +++ b/.evergreen/config_generator/etc/distros.py @@ -83,8 +83,8 @@ def validate_os_ver(cls, value): ] RHEL_ZSERIES_DISTROS = [ - Distro(name='rhel83-zseries-large', os='rhel', os_type='linux', os_ver='8.3', size='large', arch='zseries'), - Distro(name='rhel83-zseries-small', os='rhel', os_type='linux', os_ver='8.3', size='small', arch='zseries'), + Distro(name='rhel8-zseries-large', os='rhel', os_type='linux', os_ver='8', size='large', arch='zseries'), + Distro(name='rhel8-zseries-small', os='rhel', os_type='linux', os_ver='8', size='small', arch='zseries'), ] UBUNTU_DISTROS = [ diff --git a/.evergreen/generated_configs/legacy-config.yml b/.evergreen/generated_configs/legacy-config.yml index c270d93b76..dcac173df3 100644 --- a/.evergreen/generated_configs/legacy-config.yml +++ b/.evergreen/generated_configs/legacy-config.yml @@ -16634,11 +16634,11 @@ buildvariants: - .latest .nossl - test-dns-openssl batchtime: 1440 -- name: zseries-rhel83 +- name: zseries-rhel8 display_name: '*zSeries' expansions: CC: gcc - run_on: rhel83-zseries-small + run_on: rhel8-zseries-large tasks: - release-compile - debug-compile-no-align diff --git a/.evergreen/generated_configs/tasks.yml b/.evergreen/generated_configs/tasks.yml index 14e55af217..e3e4fbe8e8 100644 --- a/.evergreen/generated_configs/tasks.yml +++ b/.evergreen/generated_configs/tasks.yml @@ -1763,18 +1763,9 @@ tasks: vars: CC: gcc - func: upload-build - - name: cse-sasl-cyrus-openssl-rhel80-gcc-compile - run_on: rhel80-large - tags: [cse-matrix-openssl, compile, rhel80, gcc, cse, sasl-cyrus] - commands: - - func: find-cmake-latest - - func: cse-sasl-cyrus-openssl-compile - vars: - CC: gcc - - func: upload-build - - name: cse-sasl-cyrus-openssl-rhel83-zseries-gcc-compile - run_on: rhel83-zseries-large - tags: [cse-matrix-openssl, compile, rhel83-zseries, gcc, cse, sasl-cyrus] + - name: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-compile + run_on: rhel8-zseries-large + tags: [cse-matrix-openssl, compile, rhel8-zseries, gcc, cse, sasl-cyrus] patchable: false commands: - func: find-cmake-latest @@ -1782,15 +1773,15 @@ tasks: vars: CC: gcc - func: upload-build - - name: cse-sasl-cyrus-openssl-rhel83-zseries-gcc-test-5.0-server-auth - run_on: rhel83-zseries-small - tags: [cse-matrix-openssl, test, rhel83-zseries, gcc, sasl-cyrus, cse, auth, server, "5.0", openssl] - depends_on: [{ name: cse-sasl-cyrus-openssl-rhel83-zseries-gcc-compile }] + - name: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-test-5.0-server-auth + run_on: rhel8-zseries-small + tags: [cse-matrix-openssl, test, rhel8-zseries, gcc, sasl-cyrus, cse, auth, server, "5.0", openssl] + depends_on: [{ name: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-compile }] patchable: false commands: - func: fetch-build vars: - BUILD_NAME: cse-sasl-cyrus-openssl-rhel83-zseries-gcc-compile + BUILD_NAME: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-compile - command: expansions.update params: updates: @@ -1803,15 +1794,15 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-mock-kms-servers - func: run-tests - - name: cse-sasl-cyrus-openssl-rhel83-zseries-gcc-test-7.0-replica-auth - run_on: rhel83-zseries-small - tags: [cse-matrix-openssl, test, rhel83-zseries, gcc, sasl-cyrus, cse, auth, replica, "7.0", openssl] - depends_on: [{ name: cse-sasl-cyrus-openssl-rhel83-zseries-gcc-compile }] + - name: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-test-7.0-replica-auth + run_on: rhel8-zseries-small + tags: [cse-matrix-openssl, test, rhel8-zseries, gcc, sasl-cyrus, cse, auth, replica, "7.0", openssl] + depends_on: [{ name: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-compile }] patchable: false commands: - func: fetch-build vars: - BUILD_NAME: cse-sasl-cyrus-openssl-rhel83-zseries-gcc-compile + BUILD_NAME: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-compile - command: expansions.update params: updates: @@ -1824,15 +1815,15 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-mock-kms-servers - func: run-tests - - name: cse-sasl-cyrus-openssl-rhel83-zseries-gcc-test-7.0-server-auth - run_on: rhel83-zseries-small - tags: [cse-matrix-openssl, test, rhel83-zseries, gcc, sasl-cyrus, cse, auth, server, "7.0", openssl] - depends_on: [{ name: cse-sasl-cyrus-openssl-rhel83-zseries-gcc-compile }] + - name: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-test-7.0-server-auth + run_on: rhel8-zseries-small + tags: [cse-matrix-openssl, test, rhel8-zseries, gcc, sasl-cyrus, cse, auth, server, "7.0", openssl] + depends_on: [{ name: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-compile }] patchable: false commands: - func: fetch-build vars: - BUILD_NAME: cse-sasl-cyrus-openssl-rhel83-zseries-gcc-compile + BUILD_NAME: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-compile - command: expansions.update params: updates: @@ -1845,15 +1836,15 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-mock-kms-servers - func: run-tests - - name: cse-sasl-cyrus-openssl-rhel83-zseries-gcc-test-8.0-replica-auth - run_on: rhel83-zseries-small - tags: [cse-matrix-openssl, test, rhel83-zseries, gcc, sasl-cyrus, cse, auth, replica, "8.0", openssl] - depends_on: [{ name: cse-sasl-cyrus-openssl-rhel83-zseries-gcc-compile }] + - name: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-test-8.0-replica-auth + run_on: rhel8-zseries-small + tags: [cse-matrix-openssl, test, rhel8-zseries, gcc, sasl-cyrus, cse, auth, replica, "8.0", openssl] + depends_on: [{ name: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-compile }] patchable: false commands: - func: fetch-build vars: - BUILD_NAME: cse-sasl-cyrus-openssl-rhel83-zseries-gcc-compile + BUILD_NAME: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-compile - command: expansions.update params: updates: @@ -1866,15 +1857,15 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-mock-kms-servers - func: run-tests - - name: cse-sasl-cyrus-openssl-rhel83-zseries-gcc-test-8.0-server-auth - run_on: rhel83-zseries-small - tags: [cse-matrix-openssl, test, rhel83-zseries, gcc, sasl-cyrus, cse, auth, server, "8.0", openssl] - depends_on: [{ name: cse-sasl-cyrus-openssl-rhel83-zseries-gcc-compile }] + - name: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-test-8.0-server-auth + run_on: rhel8-zseries-small + tags: [cse-matrix-openssl, test, rhel8-zseries, gcc, sasl-cyrus, cse, auth, server, "8.0", openssl] + depends_on: [{ name: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-compile }] patchable: false commands: - func: fetch-build vars: - BUILD_NAME: cse-sasl-cyrus-openssl-rhel83-zseries-gcc-compile + BUILD_NAME: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-compile - command: expansions.update params: updates: @@ -1887,15 +1878,15 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-mock-kms-servers - func: run-tests - - name: cse-sasl-cyrus-openssl-rhel83-zseries-gcc-test-latest-replica-auth - run_on: rhel83-zseries-small - tags: [cse-matrix-openssl, test, rhel83-zseries, gcc, sasl-cyrus, cse, auth, replica, latest, openssl] - depends_on: [{ name: cse-sasl-cyrus-openssl-rhel83-zseries-gcc-compile }] + - name: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-test-latest-replica-auth + run_on: rhel8-zseries-small + tags: [cse-matrix-openssl, test, rhel8-zseries, gcc, sasl-cyrus, cse, auth, replica, latest, openssl] + depends_on: [{ name: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-compile }] patchable: false commands: - func: fetch-build vars: - BUILD_NAME: cse-sasl-cyrus-openssl-rhel83-zseries-gcc-compile + BUILD_NAME: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-compile - command: expansions.update params: updates: @@ -1908,15 +1899,15 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-mock-kms-servers - func: run-tests - - name: cse-sasl-cyrus-openssl-rhel83-zseries-gcc-test-latest-server-auth - run_on: rhel83-zseries-small - tags: [cse-matrix-openssl, test, rhel83-zseries, gcc, sasl-cyrus, cse, auth, server, latest, openssl] - depends_on: [{ name: cse-sasl-cyrus-openssl-rhel83-zseries-gcc-compile }] + - name: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-test-latest-server-auth + run_on: rhel8-zseries-small + tags: [cse-matrix-openssl, test, rhel8-zseries, gcc, sasl-cyrus, cse, auth, server, latest, openssl] + depends_on: [{ name: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-compile }] patchable: false commands: - func: fetch-build vars: - BUILD_NAME: cse-sasl-cyrus-openssl-rhel83-zseries-gcc-compile + BUILD_NAME: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-compile - command: expansions.update params: updates: @@ -1929,6 +1920,15 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-mock-kms-servers - func: run-tests + - name: cse-sasl-cyrus-openssl-rhel80-gcc-compile + run_on: rhel80-large + tags: [cse-matrix-openssl, compile, rhel80, gcc, cse, sasl-cyrus] + commands: + - func: find-cmake-latest + - func: cse-sasl-cyrus-openssl-compile + vars: + CC: gcc + - func: upload-build - name: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-compile run_on: ubuntu2004-arm64-large tags: [cse-matrix-openssl, compile, ubuntu2004-arm64, gcc, cse, sasl-cyrus] @@ -3460,18 +3460,9 @@ tasks: vars: CC: gcc - func: upload-build - - name: sasl-cyrus-openssl-rhel80-gcc-compile - run_on: rhel80-large - tags: [sasl-matrix-openssl, compile, rhel80, gcc, sasl-cyrus] - commands: - - func: find-cmake-latest - - func: sasl-cyrus-openssl-compile - vars: - CC: gcc - - func: upload-build - - name: sasl-cyrus-openssl-rhel81-power8-gcc-compile - run_on: rhel81-power8-large - tags: [sasl-matrix-openssl, compile, rhel81-power8, gcc, sasl-cyrus] + - name: sasl-cyrus-openssl-rhel8-zseries-gcc-compile + run_on: rhel8-zseries-large + tags: [sasl-matrix-openssl, compile, rhel8-zseries, gcc, sasl-cyrus] patchable: false commands: - func: find-cmake-latest @@ -3479,114 +3470,133 @@ tasks: vars: CC: gcc - func: upload-build - - name: sasl-cyrus-openssl-rhel81-power8-gcc-test-4.2-server-auth - run_on: rhel81-power8-small - tags: [sasl-matrix-openssl, test, rhel81-power8, gcc, sasl-cyrus, auth, server, "4.2", openssl] - depends_on: [{ name: sasl-cyrus-openssl-rhel81-power8-gcc-compile }] + - name: sasl-cyrus-openssl-rhel8-zseries-gcc-test-5.0-server-auth + run_on: rhel8-zseries-small + tags: [sasl-matrix-openssl, test, rhel8-zseries, gcc, sasl-cyrus, auth, server, "5.0", openssl] + depends_on: [{ name: sasl-cyrus-openssl-rhel8-zseries-gcc-compile }] patchable: false commands: - func: fetch-build vars: - BUILD_NAME: sasl-cyrus-openssl-rhel81-power8-gcc-compile + BUILD_NAME: sasl-cyrus-openssl-rhel8-zseries-gcc-compile - command: expansions.update params: updates: - { key: CC, value: gcc } - { key: AUTH, value: auth } - - { key: MONGODB_VERSION, value: "4.2" } + - { key: MONGODB_VERSION, value: "5.0" } - { key: TOPOLOGY, value: server } - { key: SSL, value: openssl } - func: fetch-det - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: sasl-cyrus-openssl-rhel81-power8-gcc-test-4.4-server-auth - run_on: rhel81-power8-small - tags: [sasl-matrix-openssl, test, rhel81-power8, gcc, sasl-cyrus, auth, server, "4.4", openssl] - depends_on: [{ name: sasl-cyrus-openssl-rhel81-power8-gcc-compile }] + - name: sasl-cyrus-openssl-rhel8-zseries-gcc-test-6.0-server-auth + run_on: rhel8-zseries-small + tags: [sasl-matrix-openssl, test, rhel8-zseries, gcc, sasl-cyrus, auth, server, "6.0", openssl] + depends_on: [{ name: sasl-cyrus-openssl-rhel8-zseries-gcc-compile }] patchable: false commands: - func: fetch-build vars: - BUILD_NAME: sasl-cyrus-openssl-rhel81-power8-gcc-compile + BUILD_NAME: sasl-cyrus-openssl-rhel8-zseries-gcc-compile - command: expansions.update params: updates: - { key: CC, value: gcc } - { key: AUTH, value: auth } - - { key: MONGODB_VERSION, value: "4.4" } + - { key: MONGODB_VERSION, value: "6.0" } - { key: TOPOLOGY, value: server } - { key: SSL, value: openssl } - func: fetch-det - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: sasl-cyrus-openssl-rhel81-power8-gcc-test-5.0-server-auth - run_on: rhel81-power8-small - tags: [sasl-matrix-openssl, test, rhel81-power8, gcc, sasl-cyrus, auth, server, "5.0", openssl] - depends_on: [{ name: sasl-cyrus-openssl-rhel81-power8-gcc-compile }] + - name: sasl-cyrus-openssl-rhel8-zseries-gcc-test-7.0-server-auth + run_on: rhel8-zseries-small + tags: [sasl-matrix-openssl, test, rhel8-zseries, gcc, sasl-cyrus, auth, server, "7.0", openssl] + depends_on: [{ name: sasl-cyrus-openssl-rhel8-zseries-gcc-compile }] patchable: false commands: - func: fetch-build vars: - BUILD_NAME: sasl-cyrus-openssl-rhel81-power8-gcc-compile + BUILD_NAME: sasl-cyrus-openssl-rhel8-zseries-gcc-compile - command: expansions.update params: updates: - { key: CC, value: gcc } - { key: AUTH, value: auth } - - { key: MONGODB_VERSION, value: "5.0" } + - { key: MONGODB_VERSION, value: "7.0" } - { key: TOPOLOGY, value: server } - { key: SSL, value: openssl } - func: fetch-det - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: sasl-cyrus-openssl-rhel81-power8-gcc-test-6.0-server-auth - run_on: rhel81-power8-small - tags: [sasl-matrix-openssl, test, rhel81-power8, gcc, sasl-cyrus, auth, server, "6.0", openssl] - depends_on: [{ name: sasl-cyrus-openssl-rhel81-power8-gcc-compile }] + - name: sasl-cyrus-openssl-rhel8-zseries-gcc-test-8.0-server-auth + run_on: rhel8-zseries-small + tags: [sasl-matrix-openssl, test, rhel8-zseries, gcc, sasl-cyrus, auth, server, "8.0", openssl] + depends_on: [{ name: sasl-cyrus-openssl-rhel8-zseries-gcc-compile }] patchable: false commands: - func: fetch-build vars: - BUILD_NAME: sasl-cyrus-openssl-rhel81-power8-gcc-compile + BUILD_NAME: sasl-cyrus-openssl-rhel8-zseries-gcc-compile - command: expansions.update params: updates: - { key: CC, value: gcc } - { key: AUTH, value: auth } - - { key: MONGODB_VERSION, value: "6.0" } + - { key: MONGODB_VERSION, value: "8.0" } - { key: TOPOLOGY, value: server } - { key: SSL, value: openssl } - func: fetch-det - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: sasl-cyrus-openssl-rhel81-power8-gcc-test-7.0-server-auth - run_on: rhel81-power8-small - tags: [sasl-matrix-openssl, test, rhel81-power8, gcc, sasl-cyrus, auth, server, "7.0", openssl] - depends_on: [{ name: sasl-cyrus-openssl-rhel81-power8-gcc-compile }] + - name: sasl-cyrus-openssl-rhel8-zseries-gcc-test-latest-server-auth + run_on: rhel8-zseries-small + tags: [sasl-matrix-openssl, test, rhel8-zseries, gcc, sasl-cyrus, auth, server, latest, openssl] + depends_on: [{ name: sasl-cyrus-openssl-rhel8-zseries-gcc-compile }] patchable: false commands: - func: fetch-build vars: - BUILD_NAME: sasl-cyrus-openssl-rhel81-power8-gcc-compile + BUILD_NAME: sasl-cyrus-openssl-rhel8-zseries-gcc-compile - command: expansions.update params: updates: - { key: CC, value: gcc } - { key: AUTH, value: auth } - - { key: MONGODB_VERSION, value: "7.0" } + - { key: MONGODB_VERSION, value: latest } - { key: TOPOLOGY, value: server } - { key: SSL, value: openssl } - func: fetch-det - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: sasl-cyrus-openssl-rhel81-power8-gcc-test-8.0-server-auth + - name: sasl-cyrus-openssl-rhel80-gcc-compile + run_on: rhel80-large + tags: [sasl-matrix-openssl, compile, rhel80, gcc, sasl-cyrus] + commands: + - func: find-cmake-latest + - func: sasl-cyrus-openssl-compile + vars: + CC: gcc + - func: upload-build + - name: sasl-cyrus-openssl-rhel81-power8-gcc-compile + run_on: rhel81-power8-large + tags: [sasl-matrix-openssl, compile, rhel81-power8, gcc, sasl-cyrus] + patchable: false + commands: + - func: find-cmake-latest + - func: sasl-cyrus-openssl-compile + vars: + CC: gcc + - func: upload-build + - name: sasl-cyrus-openssl-rhel81-power8-gcc-test-4.2-server-auth run_on: rhel81-power8-small - tags: [sasl-matrix-openssl, test, rhel81-power8, gcc, sasl-cyrus, auth, server, "8.0", openssl] + tags: [sasl-matrix-openssl, test, rhel81-power8, gcc, sasl-cyrus, auth, server, "4.2", openssl] depends_on: [{ name: sasl-cyrus-openssl-rhel81-power8-gcc-compile }] patchable: false commands: @@ -3598,16 +3608,16 @@ tasks: updates: - { key: CC, value: gcc } - { key: AUTH, value: auth } - - { key: MONGODB_VERSION, value: "8.0" } + - { key: MONGODB_VERSION, value: "4.2" } - { key: TOPOLOGY, value: server } - { key: SSL, value: openssl } - func: fetch-det - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: sasl-cyrus-openssl-rhel81-power8-gcc-test-latest-server-auth + - name: sasl-cyrus-openssl-rhel81-power8-gcc-test-4.4-server-auth run_on: rhel81-power8-small - tags: [sasl-matrix-openssl, test, rhel81-power8, gcc, sasl-cyrus, auth, server, latest, openssl] + tags: [sasl-matrix-openssl, test, rhel81-power8, gcc, sasl-cyrus, auth, server, "4.4", openssl] depends_on: [{ name: sasl-cyrus-openssl-rhel81-power8-gcc-compile }] patchable: false commands: @@ -3619,32 +3629,22 @@ tasks: updates: - { key: CC, value: gcc } - { key: AUTH, value: auth } - - { key: MONGODB_VERSION, value: latest } + - { key: MONGODB_VERSION, value: "4.4" } - { key: TOPOLOGY, value: server } - { key: SSL, value: openssl } - func: fetch-det - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: sasl-cyrus-openssl-rhel83-zseries-gcc-compile - run_on: rhel83-zseries-large - tags: [sasl-matrix-openssl, compile, rhel83-zseries, gcc, sasl-cyrus] - patchable: false - commands: - - func: find-cmake-latest - - func: sasl-cyrus-openssl-compile - vars: - CC: gcc - - func: upload-build - - name: sasl-cyrus-openssl-rhel83-zseries-gcc-test-5.0-server-auth - run_on: rhel83-zseries-small - tags: [sasl-matrix-openssl, test, rhel83-zseries, gcc, sasl-cyrus, auth, server, "5.0", openssl] - depends_on: [{ name: sasl-cyrus-openssl-rhel83-zseries-gcc-compile }] + - name: sasl-cyrus-openssl-rhel81-power8-gcc-test-5.0-server-auth + run_on: rhel81-power8-small + tags: [sasl-matrix-openssl, test, rhel81-power8, gcc, sasl-cyrus, auth, server, "5.0", openssl] + depends_on: [{ name: sasl-cyrus-openssl-rhel81-power8-gcc-compile }] patchable: false commands: - func: fetch-build vars: - BUILD_NAME: sasl-cyrus-openssl-rhel83-zseries-gcc-compile + BUILD_NAME: sasl-cyrus-openssl-rhel81-power8-gcc-compile - command: expansions.update params: updates: @@ -3657,15 +3657,15 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: sasl-cyrus-openssl-rhel83-zseries-gcc-test-6.0-server-auth - run_on: rhel83-zseries-small - tags: [sasl-matrix-openssl, test, rhel83-zseries, gcc, sasl-cyrus, auth, server, "6.0", openssl] - depends_on: [{ name: sasl-cyrus-openssl-rhel83-zseries-gcc-compile }] + - name: sasl-cyrus-openssl-rhel81-power8-gcc-test-6.0-server-auth + run_on: rhel81-power8-small + tags: [sasl-matrix-openssl, test, rhel81-power8, gcc, sasl-cyrus, auth, server, "6.0", openssl] + depends_on: [{ name: sasl-cyrus-openssl-rhel81-power8-gcc-compile }] patchable: false commands: - func: fetch-build vars: - BUILD_NAME: sasl-cyrus-openssl-rhel83-zseries-gcc-compile + BUILD_NAME: sasl-cyrus-openssl-rhel81-power8-gcc-compile - command: expansions.update params: updates: @@ -3678,15 +3678,15 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: sasl-cyrus-openssl-rhel83-zseries-gcc-test-7.0-server-auth - run_on: rhel83-zseries-small - tags: [sasl-matrix-openssl, test, rhel83-zseries, gcc, sasl-cyrus, auth, server, "7.0", openssl] - depends_on: [{ name: sasl-cyrus-openssl-rhel83-zseries-gcc-compile }] + - name: sasl-cyrus-openssl-rhel81-power8-gcc-test-7.0-server-auth + run_on: rhel81-power8-small + tags: [sasl-matrix-openssl, test, rhel81-power8, gcc, sasl-cyrus, auth, server, "7.0", openssl] + depends_on: [{ name: sasl-cyrus-openssl-rhel81-power8-gcc-compile }] patchable: false commands: - func: fetch-build vars: - BUILD_NAME: sasl-cyrus-openssl-rhel83-zseries-gcc-compile + BUILD_NAME: sasl-cyrus-openssl-rhel81-power8-gcc-compile - command: expansions.update params: updates: @@ -3699,15 +3699,15 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: sasl-cyrus-openssl-rhel83-zseries-gcc-test-8.0-server-auth - run_on: rhel83-zseries-small - tags: [sasl-matrix-openssl, test, rhel83-zseries, gcc, sasl-cyrus, auth, server, "8.0", openssl] - depends_on: [{ name: sasl-cyrus-openssl-rhel83-zseries-gcc-compile }] + - name: sasl-cyrus-openssl-rhel81-power8-gcc-test-8.0-server-auth + run_on: rhel81-power8-small + tags: [sasl-matrix-openssl, test, rhel81-power8, gcc, sasl-cyrus, auth, server, "8.0", openssl] + depends_on: [{ name: sasl-cyrus-openssl-rhel81-power8-gcc-compile }] patchable: false commands: - func: fetch-build vars: - BUILD_NAME: sasl-cyrus-openssl-rhel83-zseries-gcc-compile + BUILD_NAME: sasl-cyrus-openssl-rhel81-power8-gcc-compile - command: expansions.update params: updates: @@ -3720,15 +3720,15 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: sasl-cyrus-openssl-rhel83-zseries-gcc-test-latest-server-auth - run_on: rhel83-zseries-small - tags: [sasl-matrix-openssl, test, rhel83-zseries, gcc, sasl-cyrus, auth, server, latest, openssl] - depends_on: [{ name: sasl-cyrus-openssl-rhel83-zseries-gcc-compile }] + - name: sasl-cyrus-openssl-rhel81-power8-gcc-test-latest-server-auth + run_on: rhel81-power8-small + tags: [sasl-matrix-openssl, test, rhel81-power8, gcc, sasl-cyrus, auth, server, latest, openssl] + depends_on: [{ name: sasl-cyrus-openssl-rhel81-power8-gcc-compile }] patchable: false commands: - func: fetch-build vars: - BUILD_NAME: sasl-cyrus-openssl-rhel83-zseries-gcc-compile + BUILD_NAME: sasl-cyrus-openssl-rhel81-power8-gcc-compile - command: expansions.update params: updates: diff --git a/.evergreen/generated_configs/variants.yml b/.evergreen/generated_configs/variants.yml index 49e5295b1c..770e2a4fae 100644 --- a/.evergreen/generated_configs/variants.yml +++ b/.evergreen/generated_configs/variants.yml @@ -106,13 +106,13 @@ buildvariants: - name: cse-sasl-cyrus-openssl-debian92-clang-compile - name: cse-sasl-cyrus-openssl-debian92-gcc-compile - name: cse-sasl-cyrus-openssl-rhel80-gcc-compile - - name: cse-sasl-cyrus-openssl-rhel83-zseries-gcc-compile + - name: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-compile batchtime: 1440 - name: cse-sasl-cyrus-openssl-ubuntu2004-clang-compile - name: cse-sasl-cyrus-openssl-ubuntu2004-gcc-compile - name: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-compile - name: cse-sasl-cyrus-openssl-windows-2019-vs2017-x64-compile - - name: cse-sasl-cyrus-openssl-rhel83-zseries-gcc-test-5.0-server-auth + - name: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-test-5.0-server-auth batchtime: 1440 - name: cse-sasl-cyrus-openssl-windows-2019-vs2017-x64-test-4.2-server-auth - name: cse-sasl-cyrus-openssl-windows-2019-vs2017-x64-test-4.4-server-auth @@ -130,17 +130,17 @@ buildvariants: - name: cse-sasl-cyrus-openssl-ubuntu2004-gcc-test-7.0-replica-auth - name: cse-sasl-cyrus-openssl-ubuntu2004-gcc-test-8.0-replica-auth - name: cse-sasl-cyrus-openssl-ubuntu2004-gcc-test-latest-replica-auth - - name: cse-sasl-cyrus-openssl-rhel83-zseries-gcc-test-7.0-server-auth + - name: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-test-7.0-server-auth batchtime: 1440 - - name: cse-sasl-cyrus-openssl-rhel83-zseries-gcc-test-8.0-server-auth + - name: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-test-8.0-server-auth batchtime: 1440 - - name: cse-sasl-cyrus-openssl-rhel83-zseries-gcc-test-latest-server-auth + - name: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-test-latest-server-auth batchtime: 1440 - - name: cse-sasl-cyrus-openssl-rhel83-zseries-gcc-test-7.0-replica-auth + - name: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-test-7.0-replica-auth batchtime: 1440 - - name: cse-sasl-cyrus-openssl-rhel83-zseries-gcc-test-8.0-replica-auth + - name: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-test-8.0-replica-auth batchtime: 1440 - - name: cse-sasl-cyrus-openssl-rhel83-zseries-gcc-test-latest-replica-auth + - name: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-test-latest-replica-auth batchtime: 1440 - name: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-test-4.4-server-auth - name: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-test-5.0-server-auth @@ -230,7 +230,7 @@ buildvariants: - name: sasl-cyrus-openssl-rhel80-gcc-compile - name: sasl-cyrus-openssl-rhel81-power8-gcc-compile batchtime: 1440 - - name: sasl-cyrus-openssl-rhel83-zseries-gcc-compile + - name: sasl-cyrus-openssl-rhel8-zseries-gcc-compile batchtime: 1440 - name: sasl-cyrus-openssl-ubuntu2004-clang-compile - name: sasl-cyrus-openssl-ubuntu2004-arm64-gcc-compile @@ -250,15 +250,15 @@ buildvariants: batchtime: 1440 - name: sasl-cyrus-openssl-rhel81-power8-gcc-test-latest-server-auth batchtime: 1440 - - name: sasl-cyrus-openssl-rhel83-zseries-gcc-test-5.0-server-auth + - name: sasl-cyrus-openssl-rhel8-zseries-gcc-test-5.0-server-auth batchtime: 1440 - - name: sasl-cyrus-openssl-rhel83-zseries-gcc-test-6.0-server-auth + - name: sasl-cyrus-openssl-rhel8-zseries-gcc-test-6.0-server-auth batchtime: 1440 - - name: sasl-cyrus-openssl-rhel83-zseries-gcc-test-7.0-server-auth + - name: sasl-cyrus-openssl-rhel8-zseries-gcc-test-7.0-server-auth batchtime: 1440 - - name: sasl-cyrus-openssl-rhel83-zseries-gcc-test-8.0-server-auth + - name: sasl-cyrus-openssl-rhel8-zseries-gcc-test-8.0-server-auth batchtime: 1440 - - name: sasl-cyrus-openssl-rhel83-zseries-gcc-test-latest-server-auth + - name: sasl-cyrus-openssl-rhel8-zseries-gcc-test-latest-server-auth batchtime: 1440 - name: sasl-cyrus-openssl-ubuntu2004-arm64-gcc-test-4.4-server-auth - name: sasl-cyrus-openssl-ubuntu2004-arm64-gcc-test-5.0-server-auth diff --git a/.evergreen/legacy_config_generator/evergreen_config_lib/variants.py b/.evergreen/legacy_config_generator/evergreen_config_lib/variants.py index 8eec8b3e90..0d0f088a1f 100644 --- a/.evergreen/legacy_config_generator/evergreen_config_lib/variants.py +++ b/.evergreen/legacy_config_generator/evergreen_config_lib/variants.py @@ -317,9 +317,9 @@ def days(n: int) -> int: batchtime=days(1), ), Variant( - "zseries-rhel83", + "zseries-rhel8", "*zSeries", - "rhel83-zseries-small", + "rhel8-zseries-large", [ "release-compile", # '.compression', --> TODO: waiting on ticket CDRIVER-3258 From 0de0f3bb97a0ff4e07014c236dcc6a1913398022 Mon Sep 17 00:00:00 2001 From: Ezra Chung Date: Fri, 15 Nov 2024 14:09:33 -0600 Subject: [PATCH 2/5] Migrate from rhel81-power8 to rhel8-power --- .../components/cse/openssl.py | 4 +- .../components/sasl/openssl.py | 12 +- .evergreen/config_generator/etc/distros.py | 10 +- .../generated_configs/legacy-config.yml | 6 +- .evergreen/generated_configs/tasks.yml | 178 +++++++++--------- .evergreen/generated_configs/variants.yml | 16 +- .../evergreen_config_lib/variants.py | 6 +- 7 files changed, 116 insertions(+), 116 deletions(-) diff --git a/.evergreen/config_generator/components/cse/openssl.py b/.evergreen/config_generator/components/cse/openssl.py index 3d988aa6e9..ee5873b390 100644 --- a/.evergreen/config_generator/components/cse/openssl.py +++ b/.evergreen/config_generator/components/cse/openssl.py @@ -80,7 +80,7 @@ def tasks(): # PowerPC and zSeries are limited resources. for task in res: - if any(pattern in task.run_on for pattern in ["power8", "zseries"]): + if any(pattern in task.run_on for pattern in ["power", "zseries"]): task.patchable = False return res @@ -95,7 +95,7 @@ def variants(): # PowerPC and zSeries are limited resources. for task in TASKS: - if any(pattern in task.run_on for pattern in ["power8", "zseries"]): + if any(pattern in task.run_on for pattern in ["power", "zseries"]): tasks.append( TaskRef( name=task.name, diff --git a/.evergreen/config_generator/components/sasl/openssl.py b/.evergreen/config_generator/components/sasl/openssl.py index 9f246c051f..a0a43dcb0b 100644 --- a/.evergreen/config_generator/components/sasl/openssl.py +++ b/.evergreen/config_generator/components/sasl/openssl.py @@ -22,17 +22,17 @@ ('debian92', 'clang', None, ['cyrus']), ('debian92', 'gcc', None, ['cyrus']), ('rhel80', 'gcc', None, ['cyrus']), - ('rhel81-power8', 'gcc', None, ['cyrus']), + ('rhel8-power', 'gcc', None, ['cyrus']), ('rhel8-zseries', 'gcc', None, ['cyrus']), - ('ubuntu2004', 'clang', None, ['cyrus']), + ('ubuntu2004', 'clang', None, ['cyrus']), ('ubuntu2004-arm64', 'gcc', None, ['cyrus']), ('ubuntu2004', 'gcc', None, ['cyrus']), ('windows-vsCurrent', 'vs2017x64', None, ['cyrus']), ] TEST_MATRIX = [ - ('rhel81-power8', 'gcc', None, 'cyrus', ['auth'], ['server', ], [ '4.2', '4.4', '5.0', '6.0', '7.0', '8.0', 'latest']), - ('rhel8-zseries', 'gcc', None, 'cyrus', ['auth'], ['server', ], [ '5.0', '6.0', '7.0', '8.0', 'latest']), + ('rhel8-power', 'gcc', None, 'cyrus', ['auth'], ['server'], ['4.2', '4.4', '5.0', '6.0', '7.0', '8.0', 'latest']), + ('rhel8-zseries', 'gcc', None, 'cyrus', ['auth'], ['server'], [ '5.0', '6.0', '7.0', '8.0', 'latest']), ('ubuntu2004-arm64', 'gcc', None, 'cyrus', ['auth'], ['server'], ['4.4', '5.0', '6.0', '7.0', '8.0', 'latest']), ('ubuntu2004', 'gcc', None, 'cyrus', ['auth'], ['server'], ['4.4', '5.0', '6.0', '7.0', '8.0', 'latest']), @@ -75,7 +75,7 @@ def tasks(): # PowerPC and zSeries are limited resources. for task in res: - if any(pattern in task.run_on for pattern in ["power8", "zseries"]): + if any(pattern in task.run_on for pattern in ["power", "zseries"]): task.patchable = False return res @@ -88,7 +88,7 @@ def variants(): # PowerPC and zSeries are limited resources. for task in TASKS: - if any(pattern in task.run_on for pattern in ["power8", "zseries"]): + if any(pattern in task.run_on for pattern in ["power", "zseries"]): tasks.append( TaskRef( name=task.name, diff --git a/.evergreen/config_generator/etc/distros.py b/.evergreen/config_generator/etc/distros.py index e42ef2abe7..7d9d5f8f32 100644 --- a/.evergreen/config_generator/etc/distros.py +++ b/.evergreen/config_generator/etc/distros.py @@ -32,7 +32,7 @@ class Distro(BaseModel): 'vsMulti', ] | None = None size: Literal['small', 'large'] | None = None - arch: Literal['arm64', 'power8', 'zseries'] | None = None + arch: Literal['arm64', 'power', 'zseries'] | None = None @validator('os_ver') @classmethod @@ -77,9 +77,9 @@ def validate_os_ver(cls, value): Distro(name='rhel92-arm64-small', os='rhel', os_type='linux', os_ver='9.0', size='small', arch='arm64'), ] -RHEL_POWER8_DISTROS = [ - Distro(name='rhel81-power8-large', os='rhel', os_type='linux', os_ver='8.1', size='large', arch='power8'), - Distro(name='rhel81-power8-small', os='rhel', os_type='linux', os_ver='8.1', size='small', arch='power8'), +RHEL_POWER_DISTROS = [ + Distro(name='rhel8-power-large', os='rhel', os_type='linux', os_ver='8', size='large', arch='power'), + Distro(name='rhel8-power-small', os='rhel', os_type='linux', os_ver='8', size='small', arch='power'), ] RHEL_ZSERIES_DISTROS = [ @@ -134,7 +134,7 @@ def validate_os_ver(cls, value): MACOS_ARM64_DISTROS + \ RHEL_DISTROS + \ RHEL_ARM64_DISTROS + \ - RHEL_POWER8_DISTROS + \ + RHEL_POWER_DISTROS + \ RHEL_ZSERIES_DISTROS + \ UBUNTU_DISTROS + \ UBUNTU_ARM64_DISTROS + \ diff --git a/.evergreen/generated_configs/legacy-config.yml b/.evergreen/generated_configs/legacy-config.yml index dcac173df3..7bb5d31220 100644 --- a/.evergreen/generated_configs/legacy-config.yml +++ b/.evergreen/generated_configs/legacy-config.yml @@ -16605,11 +16605,11 @@ buildvariants: run_on: windows-vsCurrent-large tasks: - debug-compile-no-align -- name: power8-rhel81 - display_name: Power8 (ppc64le) (RHEL 8.1) +- name: rhel8-power + display_name: Power (ppc64le) (RHEL 8) expansions: CC: gcc - run_on: rhel81-power8-test + run_on: rhel8-power-large tasks: - release-compile - debug-compile-nosasl-nossl diff --git a/.evergreen/generated_configs/tasks.yml b/.evergreen/generated_configs/tasks.yml index e3e4fbe8e8..0fdce4d46c 100644 --- a/.evergreen/generated_configs/tasks.yml +++ b/.evergreen/generated_configs/tasks.yml @@ -3460,9 +3460,9 @@ tasks: vars: CC: gcc - func: upload-build - - name: sasl-cyrus-openssl-rhel8-zseries-gcc-compile - run_on: rhel8-zseries-large - tags: [sasl-matrix-openssl, compile, rhel8-zseries, gcc, sasl-cyrus] + - name: sasl-cyrus-openssl-rhel8-power-gcc-compile + run_on: rhel8-power-large + tags: [sasl-matrix-openssl, compile, rhel8-power, gcc, sasl-cyrus] patchable: false commands: - func: find-cmake-latest @@ -3470,181 +3470,172 @@ tasks: vars: CC: gcc - func: upload-build - - name: sasl-cyrus-openssl-rhel8-zseries-gcc-test-5.0-server-auth - run_on: rhel8-zseries-small - tags: [sasl-matrix-openssl, test, rhel8-zseries, gcc, sasl-cyrus, auth, server, "5.0", openssl] - depends_on: [{ name: sasl-cyrus-openssl-rhel8-zseries-gcc-compile }] + - name: sasl-cyrus-openssl-rhel8-power-gcc-test-4.2-server-auth + run_on: rhel8-power-small + tags: [sasl-matrix-openssl, test, rhel8-power, gcc, sasl-cyrus, auth, server, "4.2", openssl] + depends_on: [{ name: sasl-cyrus-openssl-rhel8-power-gcc-compile }] patchable: false commands: - func: fetch-build vars: - BUILD_NAME: sasl-cyrus-openssl-rhel8-zseries-gcc-compile + BUILD_NAME: sasl-cyrus-openssl-rhel8-power-gcc-compile - command: expansions.update params: updates: - { key: CC, value: gcc } - { key: AUTH, value: auth } - - { key: MONGODB_VERSION, value: "5.0" } + - { key: MONGODB_VERSION, value: "4.2" } - { key: TOPOLOGY, value: server } - { key: SSL, value: openssl } - func: fetch-det - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: sasl-cyrus-openssl-rhel8-zseries-gcc-test-6.0-server-auth - run_on: rhel8-zseries-small - tags: [sasl-matrix-openssl, test, rhel8-zseries, gcc, sasl-cyrus, auth, server, "6.0", openssl] - depends_on: [{ name: sasl-cyrus-openssl-rhel8-zseries-gcc-compile }] + - name: sasl-cyrus-openssl-rhel8-power-gcc-test-4.4-server-auth + run_on: rhel8-power-small + tags: [sasl-matrix-openssl, test, rhel8-power, gcc, sasl-cyrus, auth, server, "4.4", openssl] + depends_on: [{ name: sasl-cyrus-openssl-rhel8-power-gcc-compile }] patchable: false commands: - func: fetch-build vars: - BUILD_NAME: sasl-cyrus-openssl-rhel8-zseries-gcc-compile + BUILD_NAME: sasl-cyrus-openssl-rhel8-power-gcc-compile - command: expansions.update params: updates: - { key: CC, value: gcc } - { key: AUTH, value: auth } - - { key: MONGODB_VERSION, value: "6.0" } + - { key: MONGODB_VERSION, value: "4.4" } - { key: TOPOLOGY, value: server } - { key: SSL, value: openssl } - func: fetch-det - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: sasl-cyrus-openssl-rhel8-zseries-gcc-test-7.0-server-auth - run_on: rhel8-zseries-small - tags: [sasl-matrix-openssl, test, rhel8-zseries, gcc, sasl-cyrus, auth, server, "7.0", openssl] - depends_on: [{ name: sasl-cyrus-openssl-rhel8-zseries-gcc-compile }] + - name: sasl-cyrus-openssl-rhel8-power-gcc-test-5.0-server-auth + run_on: rhel8-power-small + tags: [sasl-matrix-openssl, test, rhel8-power, gcc, sasl-cyrus, auth, server, "5.0", openssl] + depends_on: [{ name: sasl-cyrus-openssl-rhel8-power-gcc-compile }] patchable: false commands: - func: fetch-build vars: - BUILD_NAME: sasl-cyrus-openssl-rhel8-zseries-gcc-compile + BUILD_NAME: sasl-cyrus-openssl-rhel8-power-gcc-compile - command: expansions.update params: updates: - { key: CC, value: gcc } - { key: AUTH, value: auth } - - { key: MONGODB_VERSION, value: "7.0" } + - { key: MONGODB_VERSION, value: "5.0" } - { key: TOPOLOGY, value: server } - { key: SSL, value: openssl } - func: fetch-det - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: sasl-cyrus-openssl-rhel8-zseries-gcc-test-8.0-server-auth - run_on: rhel8-zseries-small - tags: [sasl-matrix-openssl, test, rhel8-zseries, gcc, sasl-cyrus, auth, server, "8.0", openssl] - depends_on: [{ name: sasl-cyrus-openssl-rhel8-zseries-gcc-compile }] + - name: sasl-cyrus-openssl-rhel8-power-gcc-test-6.0-server-auth + run_on: rhel8-power-small + tags: [sasl-matrix-openssl, test, rhel8-power, gcc, sasl-cyrus, auth, server, "6.0", openssl] + depends_on: [{ name: sasl-cyrus-openssl-rhel8-power-gcc-compile }] patchable: false commands: - func: fetch-build vars: - BUILD_NAME: sasl-cyrus-openssl-rhel8-zseries-gcc-compile + BUILD_NAME: sasl-cyrus-openssl-rhel8-power-gcc-compile - command: expansions.update params: updates: - { key: CC, value: gcc } - { key: AUTH, value: auth } - - { key: MONGODB_VERSION, value: "8.0" } + - { key: MONGODB_VERSION, value: "6.0" } - { key: TOPOLOGY, value: server } - { key: SSL, value: openssl } - func: fetch-det - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: sasl-cyrus-openssl-rhel8-zseries-gcc-test-latest-server-auth - run_on: rhel8-zseries-small - tags: [sasl-matrix-openssl, test, rhel8-zseries, gcc, sasl-cyrus, auth, server, latest, openssl] - depends_on: [{ name: sasl-cyrus-openssl-rhel8-zseries-gcc-compile }] + - name: sasl-cyrus-openssl-rhel8-power-gcc-test-7.0-server-auth + run_on: rhel8-power-small + tags: [sasl-matrix-openssl, test, rhel8-power, gcc, sasl-cyrus, auth, server, "7.0", openssl] + depends_on: [{ name: sasl-cyrus-openssl-rhel8-power-gcc-compile }] patchable: false commands: - func: fetch-build vars: - BUILD_NAME: sasl-cyrus-openssl-rhel8-zseries-gcc-compile + BUILD_NAME: sasl-cyrus-openssl-rhel8-power-gcc-compile - command: expansions.update params: updates: - { key: CC, value: gcc } - { key: AUTH, value: auth } - - { key: MONGODB_VERSION, value: latest } + - { key: MONGODB_VERSION, value: "7.0" } - { key: TOPOLOGY, value: server } - { key: SSL, value: openssl } - func: fetch-det - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: sasl-cyrus-openssl-rhel80-gcc-compile - run_on: rhel80-large - tags: [sasl-matrix-openssl, compile, rhel80, gcc, sasl-cyrus] - commands: - - func: find-cmake-latest - - func: sasl-cyrus-openssl-compile - vars: - CC: gcc - - func: upload-build - - name: sasl-cyrus-openssl-rhel81-power8-gcc-compile - run_on: rhel81-power8-large - tags: [sasl-matrix-openssl, compile, rhel81-power8, gcc, sasl-cyrus] - patchable: false - commands: - - func: find-cmake-latest - - func: sasl-cyrus-openssl-compile - vars: - CC: gcc - - func: upload-build - - name: sasl-cyrus-openssl-rhel81-power8-gcc-test-4.2-server-auth - run_on: rhel81-power8-small - tags: [sasl-matrix-openssl, test, rhel81-power8, gcc, sasl-cyrus, auth, server, "4.2", openssl] - depends_on: [{ name: sasl-cyrus-openssl-rhel81-power8-gcc-compile }] + - name: sasl-cyrus-openssl-rhel8-power-gcc-test-8.0-server-auth + run_on: rhel8-power-small + tags: [sasl-matrix-openssl, test, rhel8-power, gcc, sasl-cyrus, auth, server, "8.0", openssl] + depends_on: [{ name: sasl-cyrus-openssl-rhel8-power-gcc-compile }] patchable: false commands: - func: fetch-build vars: - BUILD_NAME: sasl-cyrus-openssl-rhel81-power8-gcc-compile + BUILD_NAME: sasl-cyrus-openssl-rhel8-power-gcc-compile - command: expansions.update params: updates: - { key: CC, value: gcc } - { key: AUTH, value: auth } - - { key: MONGODB_VERSION, value: "4.2" } + - { key: MONGODB_VERSION, value: "8.0" } - { key: TOPOLOGY, value: server } - { key: SSL, value: openssl } - func: fetch-det - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: sasl-cyrus-openssl-rhel81-power8-gcc-test-4.4-server-auth - run_on: rhel81-power8-small - tags: [sasl-matrix-openssl, test, rhel81-power8, gcc, sasl-cyrus, auth, server, "4.4", openssl] - depends_on: [{ name: sasl-cyrus-openssl-rhel81-power8-gcc-compile }] + - name: sasl-cyrus-openssl-rhel8-power-gcc-test-latest-server-auth + run_on: rhel8-power-small + tags: [sasl-matrix-openssl, test, rhel8-power, gcc, sasl-cyrus, auth, server, latest, openssl] + depends_on: [{ name: sasl-cyrus-openssl-rhel8-power-gcc-compile }] patchable: false commands: - func: fetch-build vars: - BUILD_NAME: sasl-cyrus-openssl-rhel81-power8-gcc-compile + BUILD_NAME: sasl-cyrus-openssl-rhel8-power-gcc-compile - command: expansions.update params: updates: - { key: CC, value: gcc } - { key: AUTH, value: auth } - - { key: MONGODB_VERSION, value: "4.4" } + - { key: MONGODB_VERSION, value: latest } - { key: TOPOLOGY, value: server } - { key: SSL, value: openssl } - func: fetch-det - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: sasl-cyrus-openssl-rhel81-power8-gcc-test-5.0-server-auth - run_on: rhel81-power8-small - tags: [sasl-matrix-openssl, test, rhel81-power8, gcc, sasl-cyrus, auth, server, "5.0", openssl] - depends_on: [{ name: sasl-cyrus-openssl-rhel81-power8-gcc-compile }] + - name: sasl-cyrus-openssl-rhel8-zseries-gcc-compile + run_on: rhel8-zseries-large + tags: [sasl-matrix-openssl, compile, rhel8-zseries, gcc, sasl-cyrus] + patchable: false + commands: + - func: find-cmake-latest + - func: sasl-cyrus-openssl-compile + vars: + CC: gcc + - func: upload-build + - name: sasl-cyrus-openssl-rhel8-zseries-gcc-test-5.0-server-auth + run_on: rhel8-zseries-small + tags: [sasl-matrix-openssl, test, rhel8-zseries, gcc, sasl-cyrus, auth, server, "5.0", openssl] + depends_on: [{ name: sasl-cyrus-openssl-rhel8-zseries-gcc-compile }] patchable: false commands: - func: fetch-build vars: - BUILD_NAME: sasl-cyrus-openssl-rhel81-power8-gcc-compile + BUILD_NAME: sasl-cyrus-openssl-rhel8-zseries-gcc-compile - command: expansions.update params: updates: @@ -3657,15 +3648,15 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: sasl-cyrus-openssl-rhel81-power8-gcc-test-6.0-server-auth - run_on: rhel81-power8-small - tags: [sasl-matrix-openssl, test, rhel81-power8, gcc, sasl-cyrus, auth, server, "6.0", openssl] - depends_on: [{ name: sasl-cyrus-openssl-rhel81-power8-gcc-compile }] + - name: sasl-cyrus-openssl-rhel8-zseries-gcc-test-6.0-server-auth + run_on: rhel8-zseries-small + tags: [sasl-matrix-openssl, test, rhel8-zseries, gcc, sasl-cyrus, auth, server, "6.0", openssl] + depends_on: [{ name: sasl-cyrus-openssl-rhel8-zseries-gcc-compile }] patchable: false commands: - func: fetch-build vars: - BUILD_NAME: sasl-cyrus-openssl-rhel81-power8-gcc-compile + BUILD_NAME: sasl-cyrus-openssl-rhel8-zseries-gcc-compile - command: expansions.update params: updates: @@ -3678,15 +3669,15 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: sasl-cyrus-openssl-rhel81-power8-gcc-test-7.0-server-auth - run_on: rhel81-power8-small - tags: [sasl-matrix-openssl, test, rhel81-power8, gcc, sasl-cyrus, auth, server, "7.0", openssl] - depends_on: [{ name: sasl-cyrus-openssl-rhel81-power8-gcc-compile }] + - name: sasl-cyrus-openssl-rhel8-zseries-gcc-test-7.0-server-auth + run_on: rhel8-zseries-small + tags: [sasl-matrix-openssl, test, rhel8-zseries, gcc, sasl-cyrus, auth, server, "7.0", openssl] + depends_on: [{ name: sasl-cyrus-openssl-rhel8-zseries-gcc-compile }] patchable: false commands: - func: fetch-build vars: - BUILD_NAME: sasl-cyrus-openssl-rhel81-power8-gcc-compile + BUILD_NAME: sasl-cyrus-openssl-rhel8-zseries-gcc-compile - command: expansions.update params: updates: @@ -3699,15 +3690,15 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: sasl-cyrus-openssl-rhel81-power8-gcc-test-8.0-server-auth - run_on: rhel81-power8-small - tags: [sasl-matrix-openssl, test, rhel81-power8, gcc, sasl-cyrus, auth, server, "8.0", openssl] - depends_on: [{ name: sasl-cyrus-openssl-rhel81-power8-gcc-compile }] + - name: sasl-cyrus-openssl-rhel8-zseries-gcc-test-8.0-server-auth + run_on: rhel8-zseries-small + tags: [sasl-matrix-openssl, test, rhel8-zseries, gcc, sasl-cyrus, auth, server, "8.0", openssl] + depends_on: [{ name: sasl-cyrus-openssl-rhel8-zseries-gcc-compile }] patchable: false commands: - func: fetch-build vars: - BUILD_NAME: sasl-cyrus-openssl-rhel81-power8-gcc-compile + BUILD_NAME: sasl-cyrus-openssl-rhel8-zseries-gcc-compile - command: expansions.update params: updates: @@ -3720,15 +3711,15 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: sasl-cyrus-openssl-rhel81-power8-gcc-test-latest-server-auth - run_on: rhel81-power8-small - tags: [sasl-matrix-openssl, test, rhel81-power8, gcc, sasl-cyrus, auth, server, latest, openssl] - depends_on: [{ name: sasl-cyrus-openssl-rhel81-power8-gcc-compile }] + - name: sasl-cyrus-openssl-rhel8-zseries-gcc-test-latest-server-auth + run_on: rhel8-zseries-small + tags: [sasl-matrix-openssl, test, rhel8-zseries, gcc, sasl-cyrus, auth, server, latest, openssl] + depends_on: [{ name: sasl-cyrus-openssl-rhel8-zseries-gcc-compile }] patchable: false commands: - func: fetch-build vars: - BUILD_NAME: sasl-cyrus-openssl-rhel81-power8-gcc-compile + BUILD_NAME: sasl-cyrus-openssl-rhel8-zseries-gcc-compile - command: expansions.update params: updates: @@ -3741,6 +3732,15 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests + - name: sasl-cyrus-openssl-rhel80-gcc-compile + run_on: rhel80-large + tags: [sasl-matrix-openssl, compile, rhel80, gcc, sasl-cyrus] + commands: + - func: find-cmake-latest + - func: sasl-cyrus-openssl-compile + vars: + CC: gcc + - func: upload-build - name: sasl-cyrus-openssl-ubuntu2004-arm64-gcc-compile run_on: ubuntu2004-arm64-large tags: [sasl-matrix-openssl, compile, ubuntu2004-arm64, gcc, sasl-cyrus] diff --git a/.evergreen/generated_configs/variants.yml b/.evergreen/generated_configs/variants.yml index 770e2a4fae..8a53304380 100644 --- a/.evergreen/generated_configs/variants.yml +++ b/.evergreen/generated_configs/variants.yml @@ -228,7 +228,7 @@ buildvariants: - name: sasl-cyrus-openssl-debian92-clang-compile - name: sasl-cyrus-openssl-debian92-gcc-compile - name: sasl-cyrus-openssl-rhel80-gcc-compile - - name: sasl-cyrus-openssl-rhel81-power8-gcc-compile + - name: sasl-cyrus-openssl-rhel8-power-gcc-compile batchtime: 1440 - name: sasl-cyrus-openssl-rhel8-zseries-gcc-compile batchtime: 1440 @@ -236,19 +236,19 @@ buildvariants: - name: sasl-cyrus-openssl-ubuntu2004-arm64-gcc-compile - name: sasl-cyrus-openssl-ubuntu2004-gcc-compile - name: sasl-cyrus-openssl-windows-2019-vs2017-x64-compile - - name: sasl-cyrus-openssl-rhel81-power8-gcc-test-4.2-server-auth + - name: sasl-cyrus-openssl-rhel8-power-gcc-test-4.2-server-auth batchtime: 1440 - - name: sasl-cyrus-openssl-rhel81-power8-gcc-test-4.4-server-auth + - name: sasl-cyrus-openssl-rhel8-power-gcc-test-4.4-server-auth batchtime: 1440 - - name: sasl-cyrus-openssl-rhel81-power8-gcc-test-5.0-server-auth + - name: sasl-cyrus-openssl-rhel8-power-gcc-test-5.0-server-auth batchtime: 1440 - - name: sasl-cyrus-openssl-rhel81-power8-gcc-test-6.0-server-auth + - name: sasl-cyrus-openssl-rhel8-power-gcc-test-6.0-server-auth batchtime: 1440 - - name: sasl-cyrus-openssl-rhel81-power8-gcc-test-7.0-server-auth + - name: sasl-cyrus-openssl-rhel8-power-gcc-test-7.0-server-auth batchtime: 1440 - - name: sasl-cyrus-openssl-rhel81-power8-gcc-test-8.0-server-auth + - name: sasl-cyrus-openssl-rhel8-power-gcc-test-8.0-server-auth batchtime: 1440 - - name: sasl-cyrus-openssl-rhel81-power8-gcc-test-latest-server-auth + - name: sasl-cyrus-openssl-rhel8-power-gcc-test-latest-server-auth batchtime: 1440 - name: sasl-cyrus-openssl-rhel8-zseries-gcc-test-5.0-server-auth batchtime: 1440 diff --git a/.evergreen/legacy_config_generator/evergreen_config_lib/variants.py b/.evergreen/legacy_config_generator/evergreen_config_lib/variants.py index 0d0f088a1f..ff032e2aa8 100644 --- a/.evergreen/legacy_config_generator/evergreen_config_lib/variants.py +++ b/.evergreen/legacy_config_generator/evergreen_config_lib/variants.py @@ -284,9 +284,9 @@ def days(n: int) -> int: ), Variant("mingw", "MinGW-W64", "windows-vsCurrent-large", ["debug-compile-no-align"], {"CC": "mingw"}), Variant( - "power8-rhel81", - "Power8 (ppc64le) (RHEL 8.1)", - "rhel81-power8-test", + "rhel8-power", + "Power (ppc64le) (RHEL 8)", + "rhel8-power-large", [ "release-compile", "debug-compile-nosasl-nossl", From 710351adb08708e45333acd8f8a746bd46c63fbb Mon Sep 17 00:00:00 2001 From: Ezra Chung Date: Fri, 15 Nov 2024 14:09:33 -0600 Subject: [PATCH 3/5] Add new macos, power and zseries distros --- .evergreen/config_generator/etc/distros.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.evergreen/config_generator/etc/distros.py b/.evergreen/config_generator/etc/distros.py index 7d9d5f8f32..bc052a0b92 100644 --- a/.evergreen/config_generator/etc/distros.py +++ b/.evergreen/config_generator/etc/distros.py @@ -57,6 +57,8 @@ def validate_os_ver(cls, value): MACOS_ARM64_DISTROS = [ Distro(name='macos-1100-arm64', os='macos', os_type='macos', os_ver='11.00', arch='arm64'), + Distro(name='macos-11-arm64', os='macos', os_type='macos', os_ver='11', arch='arm64'), + Distro(name='macos-14-arm64', os='macos', os_type='macos', os_ver='14', arch='arm64'), ] RHEL_DISTROS = [ @@ -80,11 +82,15 @@ def validate_os_ver(cls, value): RHEL_POWER_DISTROS = [ Distro(name='rhel8-power-large', os='rhel', os_type='linux', os_ver='8', size='large', arch='power'), Distro(name='rhel8-power-small', os='rhel', os_type='linux', os_ver='8', size='small', arch='power'), + Distro(name='rhel9-power-large', os='rhel', os_type='linux', os_ver='9', size='large', arch='power'), + Distro(name='rhel9-power-small', os='rhel', os_type='linux', os_ver='9', size='small', arch='power'), ] RHEL_ZSERIES_DISTROS = [ Distro(name='rhel8-zseries-large', os='rhel', os_type='linux', os_ver='8', size='large', arch='zseries'), Distro(name='rhel8-zseries-small', os='rhel', os_type='linux', os_ver='8', size='small', arch='zseries'), + Distro(name='rhel9-zseries-large', os='rhel', os_type='linux', os_ver='9', size='large', arch='zseries'), + Distro(name='rhel9-zseries-small', os='rhel', os_type='linux', os_ver='9', size='small', arch='zseries'), ] UBUNTU_DISTROS = [ From 62239b2880224b8dd1774eb96a6da8bbab0e6b93 Mon Sep 17 00:00:00 2001 From: Ezra Chung Date: Fri, 15 Nov 2024 14:09:34 -0600 Subject: [PATCH 4/5] Migrate to newer MacOS distros and recommended architectures --- .../components/cse/darwinssl.py | 12 +- .../components/sasl/darwinssl.py | 11 +- .../config_generator/components/scan_build.py | 2 +- .evergreen/config_generator/etc/distros.py | 3 +- .../generated_configs/legacy-config.yml | 25 +- .evergreen/generated_configs/tasks.yml | 435 ++++++++++++------ .../evergreen_config_lib/variants.py | 27 +- .evergreen/scripts/compile-scan-build.sh | 48 +- .evergreen/scripts/link-sample-program.sh | 2 +- 9 files changed, 373 insertions(+), 192 deletions(-) diff --git a/.evergreen/config_generator/components/cse/darwinssl.py b/.evergreen/config_generator/components/cse/darwinssl.py index da9e78f496..9a7c33f031 100644 --- a/.evergreen/config_generator/components/cse/darwinssl.py +++ b/.evergreen/config_generator/components/cse/darwinssl.py @@ -14,15 +14,21 @@ # pylint: disable=line-too-long # fmt: off COMPILE_MATRIX = [ - ('macos-1100', 'clang', None, ['cyrus']), + ('macos-14', 'clang', None, ['cyrus']), + + ('macos-11-arm64', 'clang', None, ['cyrus']), + ('macos-14-arm64', 'clang', None, ['cyrus']), ] # TODO (CDRIVER-3789): test cse with the 'sharded' topology. TEST_MATRIX = [ - ('macos-1100', 'clang', None, 'cyrus', ['auth'], ['server', 'replica' ], ['4.2', '4.4', '5.0', '6.0' ]), + ('macos-14', 'clang', None, 'cyrus', ['auth'], ['server', 'replica' ], ['4.2', '4.4', '5.0']), + + ('macos-11-arm64', 'clang', None, 'cyrus', ['auth'], ['server', 'replica' ], ['6.0']), + ('macos-14-arm64', 'clang', None, 'cyrus', ['auth'], ['server', 'replica' ], ['6.0']), # Test 7.0+ with a replica set since Queryable Encryption does not support the 'server' topology. Queryable Encryption tests require 7.0+. - ('macos-1100', 'clang', None, 'cyrus', ['auth'], ['server', 'replica' ], [ '7.0', '8.0', 'latest']), + ('macos-14-arm64', 'clang', None, 'cyrus', ['auth'], ['server', 'replica' ], ['7.0', '8.0', 'latest']), ] # fmt: on # pylint: enable=line-too-long diff --git a/.evergreen/config_generator/components/sasl/darwinssl.py b/.evergreen/config_generator/components/sasl/darwinssl.py index eb8a350e1e..b756794c08 100644 --- a/.evergreen/config_generator/components/sasl/darwinssl.py +++ b/.evergreen/config_generator/components/sasl/darwinssl.py @@ -15,12 +15,17 @@ # pylint: disable=line-too-long # fmt: off COMPILE_MATRIX = [ - ('macos-1100', 'clang', None, ['cyrus']), - ('macos-1100-arm64', 'clang', None, ['cyrus']), + ('macos-14', 'clang', None, ['cyrus']), + + ('macos-11-arm64', 'clang', None, ['cyrus']), + ('macos-14-arm64', 'clang', None, ['cyrus']), ] TEST_MATRIX = [ - ('macos-1100', 'clang', None, 'cyrus', ['auth'], ['server'], ['4.0', '4.2', '4.4', '5.0', '6.0', '7.0', '8.0', 'latest']), + ('macos-14', 'clang', None, 'cyrus', ['auth'], ['server'], ['4.0', '4.2', '4.4', '5.0']), + + ('macos-11-arm64', 'clang', None, 'cyrus', ['auth'], ['server'], ['6.0', '7.0', '8.0', 'latest']), + ('macos-14-arm64', 'clang', None, 'cyrus', ['auth'], ['server'], ['6.0', '7.0', '8.0', 'latest']), ] # fmt: on # pylint: enable=line-too-long diff --git a/.evergreen/config_generator/components/scan_build.py b/.evergreen/config_generator/components/scan_build.py index bc75de2b55..851000555b 100644 --- a/.evergreen/config_generator/components/scan_build.py +++ b/.evergreen/config_generator/components/scan_build.py @@ -18,7 +18,7 @@ # pylint: disable=line-too-long # fmt: off MATRIX = [ - ('macos-1100', 'clang', None ), + ('macos-14', 'clang', None ), ('ubuntu2004-arm64', 'clang', None ), ('ubuntu2004', 'clang', 'i686'), ] diff --git a/.evergreen/config_generator/etc/distros.py b/.evergreen/config_generator/etc/distros.py index bc052a0b92..def5d3dd44 100644 --- a/.evergreen/config_generator/etc/distros.py +++ b/.evergreen/config_generator/etc/distros.py @@ -52,11 +52,10 @@ def validate_os_ver(cls, value): ] MACOS_DISTROS = [ - Distro(name='macos-1100', os='macos', os_type='macos', os_ver='11.00'), + Distro(name='macos-14', os='macos', os_type='macos', os_ver='14'), ] MACOS_ARM64_DISTROS = [ - Distro(name='macos-1100-arm64', os='macos', os_type='macos', os_ver='11.00', arch='arm64'), Distro(name='macos-11-arm64', os='macos', os_type='macos', os_ver='11', arch='arm64'), Distro(name='macos-14-arm64', os='macos', os_type='macos', os_ver='14', arch='arm64'), ] diff --git a/.evergreen/generated_configs/legacy-config.yml b/.evergreen/generated_configs/legacy-config.yml index 7bb5d31220..07cf2823c6 100644 --- a/.evergreen/generated_configs/legacy-config.yml +++ b/.evergreen/generated_configs/legacy-config.yml @@ -16355,10 +16355,10 @@ buildvariants: - link-with-cmake-snappy-deprecated - name: link-with-cmake-mac distros: - - macos-1100 + - macos-14-arm64 - name: link-with-cmake-mac-deprecated distros: - - macos-1100 + - macos-14-arm64 - name: link-with-cmake-windows distros: - windows-vsCurrent-large @@ -16376,7 +16376,7 @@ buildvariants: - ubuntu2004-test - name: link-with-pkg-config-mac distros: - - macos-1100 + - macos-14-arm64 - link-with-pkg-config-ssl - link-with-bson - name: link-with-bson-windows @@ -16384,7 +16384,7 @@ buildvariants: - windows-vsCurrent-large - name: link-with-bson-mac distros: - - macos-1100 + - macos-14-arm64 - name: link-with-bson-mingw distros: - windows-vsCurrent-large @@ -16522,12 +16522,11 @@ buildvariants: display_name: '*Darwin, macOS (Apple LLVM)' expansions: CC: clang - run_on: macos-1100 + run_on: macos-14-arm64 tasks: - .compression !.snappy - release-compile - debug-compile-nosasl-nossl - - debug-compile-rdtscp - debug-compile-no-align - debug-compile-nosrv - debug-compile-sasl-darwinssl @@ -16539,8 +16538,16 @@ buildvariants: - debug-compile-lto - debug-compile-lto-thin - debug-compile-aws - - test-aws-openssl-regular-4.4 - test-aws-openssl-regular-latest +- name: darwin-intel + display_name: '*Darwin, Intel macOS (Apple LLVM)' + expansions: + CC: clang + run_on: macos-14 + tasks: + - debug-compile-aws + - debug-compile-rdtscp + - test-aws-openssl-regular-4.4 - name: windows-2017-32 display_name: Windows (i686) (VS 2017) expansions: @@ -16691,14 +16698,14 @@ buildvariants: - name: debug-compile-nosasl-openssl-static - name: debug-compile-nosasl-darwinssl distros: - - macos-1100 + - macos-14-arm64 - name: debug-compile-nosasl-winssl distros: - windows-vsCurrent-large - name: .ocsp-openssl - name: .ocsp-darwinssl distros: - - macos-1100 + - macos-14-arm64 - name: .ocsp-winssl distros: - windows-vsCurrent-large diff --git a/.evergreen/generated_configs/tasks.yml b/.evergreen/generated_configs/tasks.yml index 0fdce4d46c..9167ada13a 100644 --- a/.evergreen/generated_configs/tasks.yml +++ b/.evergreen/generated_configs/tasks.yml @@ -1398,289 +1398,347 @@ tasks: - --secret=SILK_CLIENT_SECRET - +create-silk-asset-group - --branch=${branch_name} - - name: cse-sasl-cyrus-darwinssl-macos-1100-clang-compile - run_on: macos-1100 - tags: [cse-matrix-darwinssl, compile, macos-1100, clang, cse, sasl-cyrus] + - name: cse-sasl-cyrus-darwinssl-macos-11-arm64-clang-compile + run_on: macos-11-arm64 + tags: [cse-matrix-darwinssl, compile, macos-11-arm64, clang, cse, sasl-cyrus] commands: - func: find-cmake-latest - func: cse-sasl-cyrus-darwinssl-compile vars: CC: clang - func: upload-build - - name: cse-sasl-cyrus-darwinssl-macos-1100-clang-test-4.2-replica-auth - run_on: macos-1100 - tags: [cse-matrix-darwinssl, test, macos-1100, clang, sasl-cyrus, cse, auth, replica, "4.2", darwinssl] - depends_on: [{ name: cse-sasl-cyrus-darwinssl-macos-1100-clang-compile }] + - name: cse-sasl-cyrus-darwinssl-macos-11-arm64-clang-test-6.0-replica-auth + run_on: macos-11-arm64 + tags: [cse-matrix-darwinssl, test, macos-11-arm64, clang, sasl-cyrus, cse, auth, replica, "6.0", darwinssl] + depends_on: [{ name: cse-sasl-cyrus-darwinssl-macos-11-arm64-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: cse-sasl-cyrus-darwinssl-macos-1100-clang-compile + BUILD_NAME: cse-sasl-cyrus-darwinssl-macos-11-arm64-clang-compile - command: expansions.update params: updates: - { key: CC, value: clang } - { key: AUTH, value: auth } - - { key: MONGODB_VERSION, value: "4.2" } + - { key: MONGODB_VERSION, value: "6.0" } - { key: TOPOLOGY, value: replica_set } - { key: SSL, value: darwinssl } - func: fetch-det - func: bootstrap-mongo-orchestration - func: run-mock-kms-servers - func: run-tests - - name: cse-sasl-cyrus-darwinssl-macos-1100-clang-test-4.2-server-auth - run_on: macos-1100 - tags: [cse-matrix-darwinssl, test, macos-1100, clang, sasl-cyrus, cse, auth, server, "4.2", darwinssl] - depends_on: [{ name: cse-sasl-cyrus-darwinssl-macos-1100-clang-compile }] + - name: cse-sasl-cyrus-darwinssl-macos-11-arm64-clang-test-6.0-server-auth + run_on: macos-11-arm64 + tags: [cse-matrix-darwinssl, test, macos-11-arm64, clang, sasl-cyrus, cse, auth, server, "6.0", darwinssl] + depends_on: [{ name: cse-sasl-cyrus-darwinssl-macos-11-arm64-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: cse-sasl-cyrus-darwinssl-macos-1100-clang-compile + BUILD_NAME: cse-sasl-cyrus-darwinssl-macos-11-arm64-clang-compile - command: expansions.update params: updates: - { key: CC, value: clang } - { key: AUTH, value: auth } - - { key: MONGODB_VERSION, value: "4.2" } + - { key: MONGODB_VERSION, value: "6.0" } - { key: TOPOLOGY, value: server } - { key: SSL, value: darwinssl } - func: fetch-det - func: bootstrap-mongo-orchestration - func: run-mock-kms-servers - func: run-tests - - name: cse-sasl-cyrus-darwinssl-macos-1100-clang-test-4.4-replica-auth - run_on: macos-1100 - tags: [cse-matrix-darwinssl, test, macos-1100, clang, sasl-cyrus, cse, auth, replica, "4.4", darwinssl] - depends_on: [{ name: cse-sasl-cyrus-darwinssl-macos-1100-clang-compile }] + - name: cse-sasl-cyrus-darwinssl-macos-14-arm64-clang-compile + run_on: macos-14-arm64 + tags: [cse-matrix-darwinssl, compile, macos-14-arm64, clang, cse, sasl-cyrus] + commands: + - func: find-cmake-latest + - func: cse-sasl-cyrus-darwinssl-compile + vars: + CC: clang + - func: upload-build + - name: cse-sasl-cyrus-darwinssl-macos-14-arm64-clang-test-6.0-replica-auth + run_on: macos-14-arm64 + tags: [cse-matrix-darwinssl, test, macos-14-arm64, clang, sasl-cyrus, cse, auth, replica, "6.0", darwinssl] + depends_on: [{ name: cse-sasl-cyrus-darwinssl-macos-14-arm64-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: cse-sasl-cyrus-darwinssl-macos-1100-clang-compile + BUILD_NAME: cse-sasl-cyrus-darwinssl-macos-14-arm64-clang-compile - command: expansions.update params: updates: - { key: CC, value: clang } - { key: AUTH, value: auth } - - { key: MONGODB_VERSION, value: "4.4" } + - { key: MONGODB_VERSION, value: "6.0" } - { key: TOPOLOGY, value: replica_set } - { key: SSL, value: darwinssl } - func: fetch-det - func: bootstrap-mongo-orchestration - func: run-mock-kms-servers - func: run-tests - - name: cse-sasl-cyrus-darwinssl-macos-1100-clang-test-4.4-server-auth - run_on: macos-1100 - tags: [cse-matrix-darwinssl, test, macos-1100, clang, sasl-cyrus, cse, auth, server, "4.4", darwinssl] - depends_on: [{ name: cse-sasl-cyrus-darwinssl-macos-1100-clang-compile }] + - name: cse-sasl-cyrus-darwinssl-macos-14-arm64-clang-test-6.0-server-auth + run_on: macos-14-arm64 + tags: [cse-matrix-darwinssl, test, macos-14-arm64, clang, sasl-cyrus, cse, auth, server, "6.0", darwinssl] + depends_on: [{ name: cse-sasl-cyrus-darwinssl-macos-14-arm64-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: cse-sasl-cyrus-darwinssl-macos-1100-clang-compile + BUILD_NAME: cse-sasl-cyrus-darwinssl-macos-14-arm64-clang-compile - command: expansions.update params: updates: - { key: CC, value: clang } - { key: AUTH, value: auth } - - { key: MONGODB_VERSION, value: "4.4" } + - { key: MONGODB_VERSION, value: "6.0" } - { key: TOPOLOGY, value: server } - { key: SSL, value: darwinssl } - func: fetch-det - func: bootstrap-mongo-orchestration - func: run-mock-kms-servers - func: run-tests - - name: cse-sasl-cyrus-darwinssl-macos-1100-clang-test-5.0-replica-auth - run_on: macos-1100 - tags: [cse-matrix-darwinssl, test, macos-1100, clang, sasl-cyrus, cse, auth, replica, "5.0", darwinssl] - depends_on: [{ name: cse-sasl-cyrus-darwinssl-macos-1100-clang-compile }] + - name: cse-sasl-cyrus-darwinssl-macos-14-arm64-clang-test-7.0-replica-auth + run_on: macos-14-arm64 + tags: [cse-matrix-darwinssl, test, macos-14-arm64, clang, sasl-cyrus, cse, auth, replica, "7.0", darwinssl] + depends_on: [{ name: cse-sasl-cyrus-darwinssl-macos-14-arm64-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: cse-sasl-cyrus-darwinssl-macos-1100-clang-compile + BUILD_NAME: cse-sasl-cyrus-darwinssl-macos-14-arm64-clang-compile - command: expansions.update params: updates: - { key: CC, value: clang } - { key: AUTH, value: auth } - - { key: MONGODB_VERSION, value: "5.0" } + - { key: MONGODB_VERSION, value: "7.0" } - { key: TOPOLOGY, value: replica_set } - { key: SSL, value: darwinssl } - func: fetch-det - func: bootstrap-mongo-orchestration - func: run-mock-kms-servers - func: run-tests - - name: cse-sasl-cyrus-darwinssl-macos-1100-clang-test-5.0-server-auth - run_on: macos-1100 - tags: [cse-matrix-darwinssl, test, macos-1100, clang, sasl-cyrus, cse, auth, server, "5.0", darwinssl] - depends_on: [{ name: cse-sasl-cyrus-darwinssl-macos-1100-clang-compile }] + - name: cse-sasl-cyrus-darwinssl-macos-14-arm64-clang-test-7.0-server-auth + run_on: macos-14-arm64 + tags: [cse-matrix-darwinssl, test, macos-14-arm64, clang, sasl-cyrus, cse, auth, server, "7.0", darwinssl] + depends_on: [{ name: cse-sasl-cyrus-darwinssl-macos-14-arm64-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: cse-sasl-cyrus-darwinssl-macos-1100-clang-compile + BUILD_NAME: cse-sasl-cyrus-darwinssl-macos-14-arm64-clang-compile - command: expansions.update params: updates: - { key: CC, value: clang } - { key: AUTH, value: auth } - - { key: MONGODB_VERSION, value: "5.0" } + - { key: MONGODB_VERSION, value: "7.0" } - { key: TOPOLOGY, value: server } - { key: SSL, value: darwinssl } - func: fetch-det - func: bootstrap-mongo-orchestration - func: run-mock-kms-servers - func: run-tests - - name: cse-sasl-cyrus-darwinssl-macos-1100-clang-test-6.0-replica-auth - run_on: macos-1100 - tags: [cse-matrix-darwinssl, test, macos-1100, clang, sasl-cyrus, cse, auth, replica, "6.0", darwinssl] - depends_on: [{ name: cse-sasl-cyrus-darwinssl-macos-1100-clang-compile }] + - name: cse-sasl-cyrus-darwinssl-macos-14-arm64-clang-test-8.0-replica-auth + run_on: macos-14-arm64 + tags: [cse-matrix-darwinssl, test, macos-14-arm64, clang, sasl-cyrus, cse, auth, replica, "8.0", darwinssl] + depends_on: [{ name: cse-sasl-cyrus-darwinssl-macos-14-arm64-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: cse-sasl-cyrus-darwinssl-macos-1100-clang-compile + BUILD_NAME: cse-sasl-cyrus-darwinssl-macos-14-arm64-clang-compile - command: expansions.update params: updates: - { key: CC, value: clang } - { key: AUTH, value: auth } - - { key: MONGODB_VERSION, value: "6.0" } + - { key: MONGODB_VERSION, value: "8.0" } - { key: TOPOLOGY, value: replica_set } - { key: SSL, value: darwinssl } - func: fetch-det - func: bootstrap-mongo-orchestration - func: run-mock-kms-servers - func: run-tests - - name: cse-sasl-cyrus-darwinssl-macos-1100-clang-test-6.0-server-auth - run_on: macos-1100 - tags: [cse-matrix-darwinssl, test, macos-1100, clang, sasl-cyrus, cse, auth, server, "6.0", darwinssl] - depends_on: [{ name: cse-sasl-cyrus-darwinssl-macos-1100-clang-compile }] + - name: cse-sasl-cyrus-darwinssl-macos-14-arm64-clang-test-8.0-server-auth + run_on: macos-14-arm64 + tags: [cse-matrix-darwinssl, test, macos-14-arm64, clang, sasl-cyrus, cse, auth, server, "8.0", darwinssl] + depends_on: [{ name: cse-sasl-cyrus-darwinssl-macos-14-arm64-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: cse-sasl-cyrus-darwinssl-macos-1100-clang-compile + BUILD_NAME: cse-sasl-cyrus-darwinssl-macos-14-arm64-clang-compile - command: expansions.update params: updates: - { key: CC, value: clang } - { key: AUTH, value: auth } - - { key: MONGODB_VERSION, value: "6.0" } + - { key: MONGODB_VERSION, value: "8.0" } - { key: TOPOLOGY, value: server } - { key: SSL, value: darwinssl } - func: fetch-det - func: bootstrap-mongo-orchestration - func: run-mock-kms-servers - func: run-tests - - name: cse-sasl-cyrus-darwinssl-macos-1100-clang-test-7.0-replica-auth - run_on: macos-1100 - tags: [cse-matrix-darwinssl, test, macos-1100, clang, sasl-cyrus, cse, auth, replica, "7.0", darwinssl] - depends_on: [{ name: cse-sasl-cyrus-darwinssl-macos-1100-clang-compile }] + - name: cse-sasl-cyrus-darwinssl-macos-14-arm64-clang-test-latest-replica-auth + run_on: macos-14-arm64 + tags: [cse-matrix-darwinssl, test, macos-14-arm64, clang, sasl-cyrus, cse, auth, replica, latest, darwinssl] + depends_on: [{ name: cse-sasl-cyrus-darwinssl-macos-14-arm64-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: cse-sasl-cyrus-darwinssl-macos-1100-clang-compile + BUILD_NAME: cse-sasl-cyrus-darwinssl-macos-14-arm64-clang-compile - command: expansions.update params: updates: - { key: CC, value: clang } - { key: AUTH, value: auth } - - { key: MONGODB_VERSION, value: "7.0" } + - { key: MONGODB_VERSION, value: latest } - { key: TOPOLOGY, value: replica_set } - { key: SSL, value: darwinssl } - func: fetch-det - func: bootstrap-mongo-orchestration - func: run-mock-kms-servers - func: run-tests - - name: cse-sasl-cyrus-darwinssl-macos-1100-clang-test-7.0-server-auth - run_on: macos-1100 - tags: [cse-matrix-darwinssl, test, macos-1100, clang, sasl-cyrus, cse, auth, server, "7.0", darwinssl] - depends_on: [{ name: cse-sasl-cyrus-darwinssl-macos-1100-clang-compile }] + - name: cse-sasl-cyrus-darwinssl-macos-14-arm64-clang-test-latest-server-auth + run_on: macos-14-arm64 + tags: [cse-matrix-darwinssl, test, macos-14-arm64, clang, sasl-cyrus, cse, auth, server, latest, darwinssl] + depends_on: [{ name: cse-sasl-cyrus-darwinssl-macos-14-arm64-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: cse-sasl-cyrus-darwinssl-macos-1100-clang-compile + BUILD_NAME: cse-sasl-cyrus-darwinssl-macos-14-arm64-clang-compile - command: expansions.update params: updates: - { key: CC, value: clang } - { key: AUTH, value: auth } - - { key: MONGODB_VERSION, value: "7.0" } + - { key: MONGODB_VERSION, value: latest } - { key: TOPOLOGY, value: server } - { key: SSL, value: darwinssl } - func: fetch-det - func: bootstrap-mongo-orchestration - func: run-mock-kms-servers - func: run-tests - - name: cse-sasl-cyrus-darwinssl-macos-1100-clang-test-8.0-replica-auth - run_on: macos-1100 - tags: [cse-matrix-darwinssl, test, macos-1100, clang, sasl-cyrus, cse, auth, replica, "8.0", darwinssl] - depends_on: [{ name: cse-sasl-cyrus-darwinssl-macos-1100-clang-compile }] + - name: cse-sasl-cyrus-darwinssl-macos-14-clang-compile + run_on: macos-14 + tags: [cse-matrix-darwinssl, compile, macos-14, clang, cse, sasl-cyrus] + commands: + - func: find-cmake-latest + - func: cse-sasl-cyrus-darwinssl-compile + vars: + CC: clang + - func: upload-build + - name: cse-sasl-cyrus-darwinssl-macos-14-clang-test-4.2-replica-auth + run_on: macos-14 + tags: [cse-matrix-darwinssl, test, macos-14, clang, sasl-cyrus, cse, auth, replica, "4.2", darwinssl] + depends_on: [{ name: cse-sasl-cyrus-darwinssl-macos-14-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: cse-sasl-cyrus-darwinssl-macos-1100-clang-compile + BUILD_NAME: cse-sasl-cyrus-darwinssl-macos-14-clang-compile - command: expansions.update params: updates: - { key: CC, value: clang } - { key: AUTH, value: auth } - - { key: MONGODB_VERSION, value: "8.0" } + - { key: MONGODB_VERSION, value: "4.2" } - { key: TOPOLOGY, value: replica_set } - { key: SSL, value: darwinssl } - func: fetch-det - func: bootstrap-mongo-orchestration - func: run-mock-kms-servers - func: run-tests - - name: cse-sasl-cyrus-darwinssl-macos-1100-clang-test-8.0-server-auth - run_on: macos-1100 - tags: [cse-matrix-darwinssl, test, macos-1100, clang, sasl-cyrus, cse, auth, server, "8.0", darwinssl] - depends_on: [{ name: cse-sasl-cyrus-darwinssl-macos-1100-clang-compile }] + - name: cse-sasl-cyrus-darwinssl-macos-14-clang-test-4.2-server-auth + run_on: macos-14 + tags: [cse-matrix-darwinssl, test, macos-14, clang, sasl-cyrus, cse, auth, server, "4.2", darwinssl] + depends_on: [{ name: cse-sasl-cyrus-darwinssl-macos-14-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: cse-sasl-cyrus-darwinssl-macos-1100-clang-compile + BUILD_NAME: cse-sasl-cyrus-darwinssl-macos-14-clang-compile - command: expansions.update params: updates: - { key: CC, value: clang } - { key: AUTH, value: auth } - - { key: MONGODB_VERSION, value: "8.0" } + - { key: MONGODB_VERSION, value: "4.2" } - { key: TOPOLOGY, value: server } - { key: SSL, value: darwinssl } - func: fetch-det - func: bootstrap-mongo-orchestration - func: run-mock-kms-servers - func: run-tests - - name: cse-sasl-cyrus-darwinssl-macos-1100-clang-test-latest-replica-auth - run_on: macos-1100 - tags: [cse-matrix-darwinssl, test, macos-1100, clang, sasl-cyrus, cse, auth, replica, latest, darwinssl] - depends_on: [{ name: cse-sasl-cyrus-darwinssl-macos-1100-clang-compile }] + - name: cse-sasl-cyrus-darwinssl-macos-14-clang-test-4.4-replica-auth + run_on: macos-14 + tags: [cse-matrix-darwinssl, test, macos-14, clang, sasl-cyrus, cse, auth, replica, "4.4", darwinssl] + depends_on: [{ name: cse-sasl-cyrus-darwinssl-macos-14-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: cse-sasl-cyrus-darwinssl-macos-1100-clang-compile + BUILD_NAME: cse-sasl-cyrus-darwinssl-macos-14-clang-compile - command: expansions.update params: updates: - { key: CC, value: clang } - { key: AUTH, value: auth } - - { key: MONGODB_VERSION, value: latest } + - { key: MONGODB_VERSION, value: "4.4" } - { key: TOPOLOGY, value: replica_set } - { key: SSL, value: darwinssl } - func: fetch-det - func: bootstrap-mongo-orchestration - func: run-mock-kms-servers - func: run-tests - - name: cse-sasl-cyrus-darwinssl-macos-1100-clang-test-latest-server-auth - run_on: macos-1100 - tags: [cse-matrix-darwinssl, test, macos-1100, clang, sasl-cyrus, cse, auth, server, latest, darwinssl] - depends_on: [{ name: cse-sasl-cyrus-darwinssl-macos-1100-clang-compile }] + - name: cse-sasl-cyrus-darwinssl-macos-14-clang-test-4.4-server-auth + run_on: macos-14 + tags: [cse-matrix-darwinssl, test, macos-14, clang, sasl-cyrus, cse, auth, server, "4.4", darwinssl] + depends_on: [{ name: cse-sasl-cyrus-darwinssl-macos-14-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: cse-sasl-cyrus-darwinssl-macos-1100-clang-compile + BUILD_NAME: cse-sasl-cyrus-darwinssl-macos-14-clang-compile - command: expansions.update params: updates: - { key: CC, value: clang } - { key: AUTH, value: auth } - - { key: MONGODB_VERSION, value: latest } + - { key: MONGODB_VERSION, value: "4.4" } + - { key: TOPOLOGY, value: server } + - { key: SSL, value: darwinssl } + - func: fetch-det + - func: bootstrap-mongo-orchestration + - func: run-mock-kms-servers + - func: run-tests + - name: cse-sasl-cyrus-darwinssl-macos-14-clang-test-5.0-replica-auth + run_on: macos-14 + tags: [cse-matrix-darwinssl, test, macos-14, clang, sasl-cyrus, cse, auth, replica, "5.0", darwinssl] + depends_on: [{ name: cse-sasl-cyrus-darwinssl-macos-14-clang-compile }] + commands: + - func: fetch-build + vars: + BUILD_NAME: cse-sasl-cyrus-darwinssl-macos-14-clang-compile + - command: expansions.update + params: + updates: + - { key: CC, value: clang } + - { key: AUTH, value: auth } + - { key: MONGODB_VERSION, value: "5.0" } + - { key: TOPOLOGY, value: replica_set } + - { key: SSL, value: darwinssl } + - func: fetch-det + - func: bootstrap-mongo-orchestration + - func: run-mock-kms-servers + - func: run-tests + - name: cse-sasl-cyrus-darwinssl-macos-14-clang-test-5.0-server-auth + run_on: macos-14 + tags: [cse-matrix-darwinssl, test, macos-14, clang, sasl-cyrus, cse, auth, server, "5.0", darwinssl] + depends_on: [{ name: cse-sasl-cyrus-darwinssl-macos-14-clang-compile }] + commands: + - func: fetch-build + vars: + BUILD_NAME: cse-sasl-cyrus-darwinssl-macos-14-clang-compile + - command: expansions.update + params: + updates: + - { key: CC, value: clang } + - { key: AUTH, value: auth } + - { key: MONGODB_VERSION, value: "5.0" } - { key: TOPOLOGY, value: server } - { key: SSL, value: darwinssl } - func: fetch-det @@ -3206,178 +3264,267 @@ tasks: - func: openssl-static-compile vars: CC: gcc - - name: sasl-cyrus-darwinssl-macos-1100-arm64-clang-compile - run_on: macos-1100-arm64 - tags: [sasl-matrix-darwinssl, compile, macos-1100-arm64, clang, sasl-cyrus] + - name: sasl-cyrus-darwinssl-macos-11-arm64-clang-compile + run_on: macos-11-arm64 + tags: [sasl-matrix-darwinssl, compile, macos-11-arm64, clang, sasl-cyrus] commands: - func: find-cmake-latest - func: sasl-cyrus-darwinssl-compile vars: CC: clang - func: upload-build - - name: sasl-cyrus-darwinssl-macos-1100-clang-compile - run_on: macos-1100 - tags: [sasl-matrix-darwinssl, compile, macos-1100, clang, sasl-cyrus] + - name: sasl-cyrus-darwinssl-macos-11-arm64-clang-test-6.0-server-auth + run_on: macos-11-arm64 + tags: [sasl-matrix-darwinssl, test, macos-11-arm64, clang, sasl-cyrus, auth, server, "6.0", darwinssl] + depends_on: [{ name: sasl-cyrus-darwinssl-macos-11-arm64-clang-compile }] + commands: + - func: fetch-build + vars: + BUILD_NAME: sasl-cyrus-darwinssl-macos-11-arm64-clang-compile + - command: expansions.update + params: + updates: + - { key: CC, value: clang } + - { key: AUTH, value: auth } + - { key: MONGODB_VERSION, value: "6.0" } + - { key: TOPOLOGY, value: server } + - { key: SSL, value: darwinssl } + - func: fetch-det + - func: bootstrap-mongo-orchestration + - func: run-simple-http-server + - func: run-tests + - name: sasl-cyrus-darwinssl-macos-11-arm64-clang-test-7.0-server-auth + run_on: macos-11-arm64 + tags: [sasl-matrix-darwinssl, test, macos-11-arm64, clang, sasl-cyrus, auth, server, "7.0", darwinssl] + depends_on: [{ name: sasl-cyrus-darwinssl-macos-11-arm64-clang-compile }] + commands: + - func: fetch-build + vars: + BUILD_NAME: sasl-cyrus-darwinssl-macos-11-arm64-clang-compile + - command: expansions.update + params: + updates: + - { key: CC, value: clang } + - { key: AUTH, value: auth } + - { key: MONGODB_VERSION, value: "7.0" } + - { key: TOPOLOGY, value: server } + - { key: SSL, value: darwinssl } + - func: fetch-det + - func: bootstrap-mongo-orchestration + - func: run-simple-http-server + - func: run-tests + - name: sasl-cyrus-darwinssl-macos-11-arm64-clang-test-8.0-server-auth + run_on: macos-11-arm64 + tags: [sasl-matrix-darwinssl, test, macos-11-arm64, clang, sasl-cyrus, auth, server, "8.0", darwinssl] + depends_on: [{ name: sasl-cyrus-darwinssl-macos-11-arm64-clang-compile }] + commands: + - func: fetch-build + vars: + BUILD_NAME: sasl-cyrus-darwinssl-macos-11-arm64-clang-compile + - command: expansions.update + params: + updates: + - { key: CC, value: clang } + - { key: AUTH, value: auth } + - { key: MONGODB_VERSION, value: "8.0" } + - { key: TOPOLOGY, value: server } + - { key: SSL, value: darwinssl } + - func: fetch-det + - func: bootstrap-mongo-orchestration + - func: run-simple-http-server + - func: run-tests + - name: sasl-cyrus-darwinssl-macos-11-arm64-clang-test-latest-server-auth + run_on: macos-11-arm64 + tags: [sasl-matrix-darwinssl, test, macos-11-arm64, clang, sasl-cyrus, auth, server, latest, darwinssl] + depends_on: [{ name: sasl-cyrus-darwinssl-macos-11-arm64-clang-compile }] + commands: + - func: fetch-build + vars: + BUILD_NAME: sasl-cyrus-darwinssl-macos-11-arm64-clang-compile + - command: expansions.update + params: + updates: + - { key: CC, value: clang } + - { key: AUTH, value: auth } + - { key: MONGODB_VERSION, value: latest } + - { key: TOPOLOGY, value: server } + - { key: SSL, value: darwinssl } + - func: fetch-det + - func: bootstrap-mongo-orchestration + - func: run-simple-http-server + - func: run-tests + - name: sasl-cyrus-darwinssl-macos-14-arm64-clang-compile + run_on: macos-14-arm64 + tags: [sasl-matrix-darwinssl, compile, macos-14-arm64, clang, sasl-cyrus] commands: - func: find-cmake-latest - func: sasl-cyrus-darwinssl-compile vars: CC: clang - func: upload-build - - name: sasl-cyrus-darwinssl-macos-1100-clang-test-4.0-server-auth - run_on: macos-1100 - tags: [sasl-matrix-darwinssl, test, macos-1100, clang, sasl-cyrus, auth, server, "4.0", darwinssl] - depends_on: [{ name: sasl-cyrus-darwinssl-macos-1100-clang-compile }] + - name: sasl-cyrus-darwinssl-macos-14-arm64-clang-test-6.0-server-auth + run_on: macos-14-arm64 + tags: [sasl-matrix-darwinssl, test, macos-14-arm64, clang, sasl-cyrus, auth, server, "6.0", darwinssl] + depends_on: [{ name: sasl-cyrus-darwinssl-macos-14-arm64-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: sasl-cyrus-darwinssl-macos-1100-clang-compile + BUILD_NAME: sasl-cyrus-darwinssl-macos-14-arm64-clang-compile - command: expansions.update params: updates: - { key: CC, value: clang } - { key: AUTH, value: auth } - - { key: MONGODB_VERSION, value: "4.0" } + - { key: MONGODB_VERSION, value: "6.0" } - { key: TOPOLOGY, value: server } - { key: SSL, value: darwinssl } - func: fetch-det - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: sasl-cyrus-darwinssl-macos-1100-clang-test-4.2-server-auth - run_on: macos-1100 - tags: [sasl-matrix-darwinssl, test, macos-1100, clang, sasl-cyrus, auth, server, "4.2", darwinssl] - depends_on: [{ name: sasl-cyrus-darwinssl-macos-1100-clang-compile }] + - name: sasl-cyrus-darwinssl-macos-14-arm64-clang-test-7.0-server-auth + run_on: macos-14-arm64 + tags: [sasl-matrix-darwinssl, test, macos-14-arm64, clang, sasl-cyrus, auth, server, "7.0", darwinssl] + depends_on: [{ name: sasl-cyrus-darwinssl-macos-14-arm64-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: sasl-cyrus-darwinssl-macos-1100-clang-compile + BUILD_NAME: sasl-cyrus-darwinssl-macos-14-arm64-clang-compile - command: expansions.update params: updates: - { key: CC, value: clang } - { key: AUTH, value: auth } - - { key: MONGODB_VERSION, value: "4.2" } + - { key: MONGODB_VERSION, value: "7.0" } - { key: TOPOLOGY, value: server } - { key: SSL, value: darwinssl } - func: fetch-det - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: sasl-cyrus-darwinssl-macos-1100-clang-test-4.4-server-auth - run_on: macos-1100 - tags: [sasl-matrix-darwinssl, test, macos-1100, clang, sasl-cyrus, auth, server, "4.4", darwinssl] - depends_on: [{ name: sasl-cyrus-darwinssl-macos-1100-clang-compile }] + - name: sasl-cyrus-darwinssl-macos-14-arm64-clang-test-8.0-server-auth + run_on: macos-14-arm64 + tags: [sasl-matrix-darwinssl, test, macos-14-arm64, clang, sasl-cyrus, auth, server, "8.0", darwinssl] + depends_on: [{ name: sasl-cyrus-darwinssl-macos-14-arm64-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: sasl-cyrus-darwinssl-macos-1100-clang-compile + BUILD_NAME: sasl-cyrus-darwinssl-macos-14-arm64-clang-compile - command: expansions.update params: updates: - { key: CC, value: clang } - { key: AUTH, value: auth } - - { key: MONGODB_VERSION, value: "4.4" } + - { key: MONGODB_VERSION, value: "8.0" } - { key: TOPOLOGY, value: server } - { key: SSL, value: darwinssl } - func: fetch-det - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: sasl-cyrus-darwinssl-macos-1100-clang-test-5.0-server-auth - run_on: macos-1100 - tags: [sasl-matrix-darwinssl, test, macos-1100, clang, sasl-cyrus, auth, server, "5.0", darwinssl] - depends_on: [{ name: sasl-cyrus-darwinssl-macos-1100-clang-compile }] + - name: sasl-cyrus-darwinssl-macos-14-arm64-clang-test-latest-server-auth + run_on: macos-14-arm64 + tags: [sasl-matrix-darwinssl, test, macos-14-arm64, clang, sasl-cyrus, auth, server, latest, darwinssl] + depends_on: [{ name: sasl-cyrus-darwinssl-macos-14-arm64-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: sasl-cyrus-darwinssl-macos-1100-clang-compile + BUILD_NAME: sasl-cyrus-darwinssl-macos-14-arm64-clang-compile - command: expansions.update params: updates: - { key: CC, value: clang } - { key: AUTH, value: auth } - - { key: MONGODB_VERSION, value: "5.0" } + - { key: MONGODB_VERSION, value: latest } - { key: TOPOLOGY, value: server } - { key: SSL, value: darwinssl } - func: fetch-det - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: sasl-cyrus-darwinssl-macos-1100-clang-test-6.0-server-auth - run_on: macos-1100 - tags: [sasl-matrix-darwinssl, test, macos-1100, clang, sasl-cyrus, auth, server, "6.0", darwinssl] - depends_on: [{ name: sasl-cyrus-darwinssl-macos-1100-clang-compile }] + - name: sasl-cyrus-darwinssl-macos-14-clang-compile + run_on: macos-14 + tags: [sasl-matrix-darwinssl, compile, macos-14, clang, sasl-cyrus] + commands: + - func: find-cmake-latest + - func: sasl-cyrus-darwinssl-compile + vars: + CC: clang + - func: upload-build + - name: sasl-cyrus-darwinssl-macos-14-clang-test-4.0-server-auth + run_on: macos-14 + tags: [sasl-matrix-darwinssl, test, macos-14, clang, sasl-cyrus, auth, server, "4.0", darwinssl] + depends_on: [{ name: sasl-cyrus-darwinssl-macos-14-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: sasl-cyrus-darwinssl-macos-1100-clang-compile + BUILD_NAME: sasl-cyrus-darwinssl-macos-14-clang-compile - command: expansions.update params: updates: - { key: CC, value: clang } - { key: AUTH, value: auth } - - { key: MONGODB_VERSION, value: "6.0" } + - { key: MONGODB_VERSION, value: "4.0" } - { key: TOPOLOGY, value: server } - { key: SSL, value: darwinssl } - func: fetch-det - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: sasl-cyrus-darwinssl-macos-1100-clang-test-7.0-server-auth - run_on: macos-1100 - tags: [sasl-matrix-darwinssl, test, macos-1100, clang, sasl-cyrus, auth, server, "7.0", darwinssl] - depends_on: [{ name: sasl-cyrus-darwinssl-macos-1100-clang-compile }] + - name: sasl-cyrus-darwinssl-macos-14-clang-test-4.2-server-auth + run_on: macos-14 + tags: [sasl-matrix-darwinssl, test, macos-14, clang, sasl-cyrus, auth, server, "4.2", darwinssl] + depends_on: [{ name: sasl-cyrus-darwinssl-macos-14-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: sasl-cyrus-darwinssl-macos-1100-clang-compile + BUILD_NAME: sasl-cyrus-darwinssl-macos-14-clang-compile - command: expansions.update params: updates: - { key: CC, value: clang } - { key: AUTH, value: auth } - - { key: MONGODB_VERSION, value: "7.0" } + - { key: MONGODB_VERSION, value: "4.2" } - { key: TOPOLOGY, value: server } - { key: SSL, value: darwinssl } - func: fetch-det - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: sasl-cyrus-darwinssl-macos-1100-clang-test-8.0-server-auth - run_on: macos-1100 - tags: [sasl-matrix-darwinssl, test, macos-1100, clang, sasl-cyrus, auth, server, "8.0", darwinssl] - depends_on: [{ name: sasl-cyrus-darwinssl-macos-1100-clang-compile }] + - name: sasl-cyrus-darwinssl-macos-14-clang-test-4.4-server-auth + run_on: macos-14 + tags: [sasl-matrix-darwinssl, test, macos-14, clang, sasl-cyrus, auth, server, "4.4", darwinssl] + depends_on: [{ name: sasl-cyrus-darwinssl-macos-14-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: sasl-cyrus-darwinssl-macos-1100-clang-compile + BUILD_NAME: sasl-cyrus-darwinssl-macos-14-clang-compile - command: expansions.update params: updates: - { key: CC, value: clang } - { key: AUTH, value: auth } - - { key: MONGODB_VERSION, value: "8.0" } + - { key: MONGODB_VERSION, value: "4.4" } - { key: TOPOLOGY, value: server } - { key: SSL, value: darwinssl } - func: fetch-det - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: sasl-cyrus-darwinssl-macos-1100-clang-test-latest-server-auth - run_on: macos-1100 - tags: [sasl-matrix-darwinssl, test, macos-1100, clang, sasl-cyrus, auth, server, latest, darwinssl] - depends_on: [{ name: sasl-cyrus-darwinssl-macos-1100-clang-compile }] + - name: sasl-cyrus-darwinssl-macos-14-clang-test-5.0-server-auth + run_on: macos-14 + tags: [sasl-matrix-darwinssl, test, macos-14, clang, sasl-cyrus, auth, server, "5.0", darwinssl] + depends_on: [{ name: sasl-cyrus-darwinssl-macos-14-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: sasl-cyrus-darwinssl-macos-1100-clang-compile + BUILD_NAME: sasl-cyrus-darwinssl-macos-14-clang-compile - command: expansions.update params: updates: - { key: CC, value: clang } - { key: AUTH, value: auth } - - { key: MONGODB_VERSION, value: latest } + - { key: MONGODB_VERSION, value: "5.0" } - { key: TOPOLOGY, value: server } - { key: SSL, value: darwinssl } - func: fetch-det @@ -4836,9 +4983,9 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: scan-build-macos-1100-clang - run_on: macos-1100 - tags: [scan-build-matrix, macos-1100, clang] + - name: scan-build-macos-14-clang + run_on: macos-14 + tags: [scan-build-matrix, macos-14, clang] commands: - func: find-cmake-latest - func: scan-build diff --git a/.evergreen/legacy_config_generator/evergreen_config_lib/variants.py b/.evergreen/legacy_config_generator/evergreen_config_lib/variants.py index ff032e2aa8..45eed74f0d 100644 --- a/.evergreen/legacy_config_generator/evergreen_config_lib/variants.py +++ b/.evergreen/legacy_config_generator/evergreen_config_lib/variants.py @@ -53,18 +53,18 @@ def days(n: int) -> int: "link-with-cmake-ssl-deprecated", "link-with-cmake-snappy", "link-with-cmake-snappy-deprecated", - OD([("name", "link-with-cmake-mac"), ("distros", ["macos-1100"])]), - OD([("name", "link-with-cmake-mac-deprecated"), ("distros", ["macos-1100"])]), + OD([("name", "link-with-cmake-mac"), ("distros", ["macos-14-arm64"])]), + OD([("name", "link-with-cmake-mac-deprecated"), ("distros", ["macos-14-arm64"])]), OD([("name", "link-with-cmake-windows"), ("distros", ["windows-vsCurrent-large"])]), OD([("name", "link-with-cmake-windows-ssl"), ("distros", ["windows-vsCurrent-large"])]), OD([("name", "link-with-cmake-windows-snappy"), ("distros", ["windows-vsCurrent-large"])]), OD([("name", "link-with-cmake-mingw"), ("distros", ["windows-vsCurrent-large"])]), OD([("name", "link-with-pkg-config"), ("distros", ["ubuntu2004-test"])]), - OD([("name", "link-with-pkg-config-mac"), ("distros", ["macos-1100"])]), + OD([("name", "link-with-pkg-config-mac"), ("distros", ["macos-14-arm64"])]), "link-with-pkg-config-ssl", "link-with-bson", OD([("name", "link-with-bson-windows"), ("distros", ["windows-vsCurrent-large"])]), - OD([("name", "link-with-bson-mac"), ("distros", ["macos-1100"])]), + OD([("name", "link-with-bson-mac"), ("distros", ["macos-14-arm64"])]), OD([("name", "link-with-bson-mingw"), ("distros", ["windows-vsCurrent-large"])]), "check-headers", "install-uninstall-check", @@ -197,12 +197,11 @@ def days(n: int) -> int: Variant( "darwin", "*Darwin, macOS (Apple LLVM)", - "macos-1100", + "macos-14-arm64", [ ".compression !.snappy", "release-compile", "debug-compile-nosasl-nossl", - "debug-compile-rdtscp", "debug-compile-no-align", "debug-compile-nosrv", "debug-compile-sasl-darwinssl", @@ -214,11 +213,21 @@ def days(n: int) -> int: "debug-compile-lto", "debug-compile-lto-thin", "debug-compile-aws", - "test-aws-openssl-regular-4.4", "test-aws-openssl-regular-latest", ], {"CC": "clang"}, ), + Variant( + "darwin-intel", + "*Darwin, Intel macOS (Apple LLVM)", + "macos-14", + [ + "debug-compile-aws", + "debug-compile-rdtscp", + "test-aws-openssl-regular-4.4", + ], + {"CC": "clang"}, + ), Variant( "windows-2017-32", "Windows (i686) (VS 2017)", @@ -378,10 +387,10 @@ def days(n: int) -> int: [ OD([("name", "debug-compile-nosasl-openssl")]), OD([("name", "debug-compile-nosasl-openssl-static")]), - OD([("name", "debug-compile-nosasl-darwinssl"), ("distros", ["macos-1100"])]), + OD([("name", "debug-compile-nosasl-darwinssl"), ("distros", ["macos-14-arm64"])]), OD([("name", "debug-compile-nosasl-winssl"), ("distros", ["windows-vsCurrent-large"])]), OD([("name", ".ocsp-openssl")]), - OD([("name", ".ocsp-darwinssl"), ("distros", ["macos-1100"])]), + OD([("name", ".ocsp-darwinssl"), ("distros", ["macos-14-arm64"])]), OD([("name", ".ocsp-winssl"), ("distros", ["windows-vsCurrent-large"])]), OD([("name", "debug-compile-nosasl-openssl-1.0.1")]), OD([("name", ".ocsp-openssl-1.0.1")]), diff --git a/.evergreen/scripts/compile-scan-build.sh b/.evergreen/scripts/compile-scan-build.sh index 90e916c696..ef6e238851 100755 --- a/.evergreen/scripts/compile-scan-build.sh +++ b/.evergreen/scripts/compile-scan-build.sh @@ -126,27 +126,35 @@ if [[ -d /usr/local/Cellar/llvm ]]; then done fi -scan_build_directories+=( - # Prefer toolchain scan-build if available. - "/opt/mongodbtoolchain/v4/bin" - "/opt/mongodbtoolchain/v3/bin" - - # Use system scan-build otherwise. - "/usr/bin" -) - -declare scan_build_binary -for dir in "${scan_build_directories[@]}"; do - if command -v "${dir}/scan-build" && command -v "${dir}/clang" && command -v "${dir}/clang++"; then - # Ensure compilers are consistent with scan-build binary. All three binaries - # should be present in the same directory. - scan_build_binary="${dir}/scan-build" - CC="${dir}/clang" - CXX="${dir}/clang++" - break - fi -done +if command -v scan-build && clmmand -v clang && command -v clang++; then + scan_build_binary="scan-build" + CC="clang" + CXX="clang++" +else + scan_build_directories+=( + # Prefer toolchain scan-build if available. + "/opt/mongodbtoolchain/v4/bin" + "/opt/mongodbtoolchain/v3/bin" + + # Use system scan-build otherwise. + "/usr/bin" + ) + + declare scan_build_binary + for dir in "${scan_build_directories[@]}"; do + if command -v "${dir}/scan-build" && command -v "${dir}/clang" && command -v "${dir}/clang++"; then + # Ensure compilers are consistent with scan-build binary. All three binaries + # should be present in the same directory. + scan_build_binary="${dir}/scan-build" + CC="${dir}/clang" + CXX="${dir}/clang++" + break + fi + done +fi : "${scan_build_binary:?"could not find a scan-build binary!"}" +: "${CC:?}" +: "${CXX:?}" # Use ccache if able. . "${script_dir:?}/find-ccache.sh" diff --git a/.evergreen/scripts/link-sample-program.sh b/.evergreen/scripts/link-sample-program.sh index f3eec54f89..b7a0054eed 100755 --- a/.evergreen/scripts/link-sample-program.sh +++ b/.evergreen/scripts/link-sample-program.sh @@ -170,7 +170,7 @@ else fi fi -if [ "$OS" = "darwin" ]; then +if [ "$OS" = "darwin" && "${HOSTTYPE:?}" != "arm64" ]; then if test -f $INSTALL_DIR/bin/mongoc-stat; then echo "mongoc-stat shouldn't have been installed" exit 1 From a20096a5f1e6760732040b50bdf06172108da114 Mon Sep 17 00:00:00 2001 From: Ezra Chung Date: Tue, 19 Nov 2024 09:21:44 -0600 Subject: [PATCH 5/5] Remove replicas from pre-7.0 cse.darwinssl matrix --- .../components/cse/darwinssl.py | 6 +- .evergreen/generated_configs/tasks.yml | 100 ------------------ 2 files changed, 3 insertions(+), 103 deletions(-) diff --git a/.evergreen/config_generator/components/cse/darwinssl.py b/.evergreen/config_generator/components/cse/darwinssl.py index 9a7c33f031..8fa99061ab 100644 --- a/.evergreen/config_generator/components/cse/darwinssl.py +++ b/.evergreen/config_generator/components/cse/darwinssl.py @@ -22,10 +22,10 @@ # TODO (CDRIVER-3789): test cse with the 'sharded' topology. TEST_MATRIX = [ - ('macos-14', 'clang', None, 'cyrus', ['auth'], ['server', 'replica' ], ['4.2', '4.4', '5.0']), + ('macos-14', 'clang', None, 'cyrus', ['auth'], ['server'], ['4.2', '4.4', '5.0']), - ('macos-11-arm64', 'clang', None, 'cyrus', ['auth'], ['server', 'replica' ], ['6.0']), - ('macos-14-arm64', 'clang', None, 'cyrus', ['auth'], ['server', 'replica' ], ['6.0']), + ('macos-11-arm64', 'clang', None, 'cyrus', ['auth'], ['server'], ['6.0']), + ('macos-14-arm64', 'clang', None, 'cyrus', ['auth'], ['server'], ['6.0']), # Test 7.0+ with a replica set since Queryable Encryption does not support the 'server' topology. Queryable Encryption tests require 7.0+. ('macos-14-arm64', 'clang', None, 'cyrus', ['auth'], ['server', 'replica' ], ['7.0', '8.0', 'latest']), diff --git a/.evergreen/generated_configs/tasks.yml b/.evergreen/generated_configs/tasks.yml index 9167ada13a..ecb54d9e8f 100644 --- a/.evergreen/generated_configs/tasks.yml +++ b/.evergreen/generated_configs/tasks.yml @@ -1407,26 +1407,6 @@ tasks: vars: CC: clang - func: upload-build - - name: cse-sasl-cyrus-darwinssl-macos-11-arm64-clang-test-6.0-replica-auth - run_on: macos-11-arm64 - tags: [cse-matrix-darwinssl, test, macos-11-arm64, clang, sasl-cyrus, cse, auth, replica, "6.0", darwinssl] - depends_on: [{ name: cse-sasl-cyrus-darwinssl-macos-11-arm64-clang-compile }] - commands: - - func: fetch-build - vars: - BUILD_NAME: cse-sasl-cyrus-darwinssl-macos-11-arm64-clang-compile - - command: expansions.update - params: - updates: - - { key: CC, value: clang } - - { key: AUTH, value: auth } - - { key: MONGODB_VERSION, value: "6.0" } - - { key: TOPOLOGY, value: replica_set } - - { key: SSL, value: darwinssl } - - func: fetch-det - - func: bootstrap-mongo-orchestration - - func: run-mock-kms-servers - - func: run-tests - name: cse-sasl-cyrus-darwinssl-macos-11-arm64-clang-test-6.0-server-auth run_on: macos-11-arm64 tags: [cse-matrix-darwinssl, test, macos-11-arm64, clang, sasl-cyrus, cse, auth, server, "6.0", darwinssl] @@ -1456,26 +1436,6 @@ tasks: vars: CC: clang - func: upload-build - - name: cse-sasl-cyrus-darwinssl-macos-14-arm64-clang-test-6.0-replica-auth - run_on: macos-14-arm64 - tags: [cse-matrix-darwinssl, test, macos-14-arm64, clang, sasl-cyrus, cse, auth, replica, "6.0", darwinssl] - depends_on: [{ name: cse-sasl-cyrus-darwinssl-macos-14-arm64-clang-compile }] - commands: - - func: fetch-build - vars: - BUILD_NAME: cse-sasl-cyrus-darwinssl-macos-14-arm64-clang-compile - - command: expansions.update - params: - updates: - - { key: CC, value: clang } - - { key: AUTH, value: auth } - - { key: MONGODB_VERSION, value: "6.0" } - - { key: TOPOLOGY, value: replica_set } - - { key: SSL, value: darwinssl } - - func: fetch-det - - func: bootstrap-mongo-orchestration - - func: run-mock-kms-servers - - func: run-tests - name: cse-sasl-cyrus-darwinssl-macos-14-arm64-clang-test-6.0-server-auth run_on: macos-14-arm64 tags: [cse-matrix-darwinssl, test, macos-14-arm64, clang, sasl-cyrus, cse, auth, server, "6.0", darwinssl] @@ -1625,26 +1585,6 @@ tasks: vars: CC: clang - func: upload-build - - name: cse-sasl-cyrus-darwinssl-macos-14-clang-test-4.2-replica-auth - run_on: macos-14 - tags: [cse-matrix-darwinssl, test, macos-14, clang, sasl-cyrus, cse, auth, replica, "4.2", darwinssl] - depends_on: [{ name: cse-sasl-cyrus-darwinssl-macos-14-clang-compile }] - commands: - - func: fetch-build - vars: - BUILD_NAME: cse-sasl-cyrus-darwinssl-macos-14-clang-compile - - command: expansions.update - params: - updates: - - { key: CC, value: clang } - - { key: AUTH, value: auth } - - { key: MONGODB_VERSION, value: "4.2" } - - { key: TOPOLOGY, value: replica_set } - - { key: SSL, value: darwinssl } - - func: fetch-det - - func: bootstrap-mongo-orchestration - - func: run-mock-kms-servers - - func: run-tests - name: cse-sasl-cyrus-darwinssl-macos-14-clang-test-4.2-server-auth run_on: macos-14 tags: [cse-matrix-darwinssl, test, macos-14, clang, sasl-cyrus, cse, auth, server, "4.2", darwinssl] @@ -1665,26 +1605,6 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-mock-kms-servers - func: run-tests - - name: cse-sasl-cyrus-darwinssl-macos-14-clang-test-4.4-replica-auth - run_on: macos-14 - tags: [cse-matrix-darwinssl, test, macos-14, clang, sasl-cyrus, cse, auth, replica, "4.4", darwinssl] - depends_on: [{ name: cse-sasl-cyrus-darwinssl-macos-14-clang-compile }] - commands: - - func: fetch-build - vars: - BUILD_NAME: cse-sasl-cyrus-darwinssl-macos-14-clang-compile - - command: expansions.update - params: - updates: - - { key: CC, value: clang } - - { key: AUTH, value: auth } - - { key: MONGODB_VERSION, value: "4.4" } - - { key: TOPOLOGY, value: replica_set } - - { key: SSL, value: darwinssl } - - func: fetch-det - - func: bootstrap-mongo-orchestration - - func: run-mock-kms-servers - - func: run-tests - name: cse-sasl-cyrus-darwinssl-macos-14-clang-test-4.4-server-auth run_on: macos-14 tags: [cse-matrix-darwinssl, test, macos-14, clang, sasl-cyrus, cse, auth, server, "4.4", darwinssl] @@ -1705,26 +1625,6 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-mock-kms-servers - func: run-tests - - name: cse-sasl-cyrus-darwinssl-macos-14-clang-test-5.0-replica-auth - run_on: macos-14 - tags: [cse-matrix-darwinssl, test, macos-14, clang, sasl-cyrus, cse, auth, replica, "5.0", darwinssl] - depends_on: [{ name: cse-sasl-cyrus-darwinssl-macos-14-clang-compile }] - commands: - - func: fetch-build - vars: - BUILD_NAME: cse-sasl-cyrus-darwinssl-macos-14-clang-compile - - command: expansions.update - params: - updates: - - { key: CC, value: clang } - - { key: AUTH, value: auth } - - { key: MONGODB_VERSION, value: "5.0" } - - { key: TOPOLOGY, value: replica_set } - - { key: SSL, value: darwinssl } - - func: fetch-det - - func: bootstrap-mongo-orchestration - - func: run-mock-kms-servers - - func: run-tests - name: cse-sasl-cyrus-darwinssl-macos-14-clang-test-5.0-server-auth run_on: macos-14 tags: [cse-matrix-darwinssl, test, macos-14, clang, sasl-cyrus, cse, auth, server, "5.0", darwinssl]