From f1eb8a4589084262d5d8c953a46bc5cb7e5fec89 Mon Sep 17 00:00:00 2001 From: Ezra Chung Date: Tue, 28 Jan 2025 12:22:01 -0600 Subject: [PATCH 1/4] CDRIVER-5873 restore compile-only coverage on Debian 9.2 --- .../components/cse/openssl.py | 14 ++++---- .../components/sasl/openssl.py | 2 ++ .evergreen/config_generator/etc/distros.py | 2 ++ .evergreen/generated_configs/tasks.yml | 36 +++++++++++++++++++ .evergreen/generated_configs/variants.yml | 8 +++-- 5 files changed, 54 insertions(+), 8 deletions(-) diff --git a/.evergreen/config_generator/components/cse/openssl.py b/.evergreen/config_generator/components/cse/openssl.py index ee5873b3905..91f2df54012 100644 --- a/.evergreen/config_generator/components/cse/openssl.py +++ b/.evergreen/config_generator/components/cse/openssl.py @@ -15,10 +15,13 @@ # pylint: disable=line-too-long # fmt: off COMPILE_MATRIX = [ - ('debian10', 'gcc', None, ['cyrus']), - ('debian11', 'gcc', None, ['cyrus']), - ('debian92', 'clang', None, ['cyrus']), - ('debian92', 'gcc', None, ['cyrus']), + ('debian92', 'clang', None, ['cyrus']), + ('debian92', 'gcc', None, ['cyrus']), + ('debian10', 'clang', None, ['cyrus']), + ('debian10', 'gcc', None, ['cyrus']), + ('debian11', 'clang', None, ['cyrus']), + ('debian11', 'gcc', None, ['cyrus']), + ('rhel80', 'gcc', None, ['cyrus']), ('rhel8-zseries', 'gcc', None, ['cyrus']), ('ubuntu2004', 'clang', None, ['cyrus']), @@ -31,7 +34,7 @@ TEST_MATRIX = [ # 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+. @@ -42,7 +45,6 @@ # Test 4.2 with Debian 10 since 4.2 does not ship on Ubuntu 20.04+. ('debian10', 'gcc', None, 'cyrus', ['auth'], ['server', 'replica'], ['4.2']), - ] # fmt: on # pylint: enable=line-too-long diff --git a/.evergreen/config_generator/components/sasl/openssl.py b/.evergreen/config_generator/components/sasl/openssl.py index a0a43dcb0bb..9cef95554e5 100644 --- a/.evergreen/config_generator/components/sasl/openssl.py +++ b/.evergreen/config_generator/components/sasl/openssl.py @@ -17,6 +17,8 @@ # pylint: disable=line-too-long # fmt: off COMPILE_MATRIX = [ + ('debian92', 'clang', None, ['cyrus']), + ('debian92', 'gcc', None, ['cyrus']), ('debian10', 'gcc', None, ['cyrus']), ('debian11', 'gcc', None, ['cyrus']), ('debian92', 'clang', None, ['cyrus']), diff --git a/.evergreen/config_generator/etc/distros.py b/.evergreen/config_generator/etc/distros.py index def5d3dd44c..c47c8482efe 100644 --- a/.evergreen/config_generator/etc/distros.py +++ b/.evergreen/config_generator/etc/distros.py @@ -43,6 +43,8 @@ def validate_os_ver(cls, value): # pylint: disable=line-too-long #fmt: off DEBIAN_DISTROS = [ + Distro(name='debian92-large', os='debian', os_type='linux', os_ver='9.2', size='large'), # CDRIVER-5873 + Distro(name='debian92-small', os='debian', os_type='linux', os_ver='9.2', size='small'), # CDRIVER-5873 Distro(name='debian10-large', os='debian', os_type='linux', os_ver='10', size='large'), Distro(name='debian10-small', os='debian', os_type='linux', os_ver='10', size='small'), Distro(name='debian11-large', os='debian', os_type='linux', os_ver='11', size='large'), diff --git a/.evergreen/generated_configs/tasks.yml b/.evergreen/generated_configs/tasks.yml index 53e85f1be7d..9ca58b4d1d2 100644 --- a/.evergreen/generated_configs/tasks.yml +++ b/.evergreen/generated_configs/tasks.yml @@ -1678,6 +1678,15 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-mock-kms-servers - func: run-tests + - name: cse-sasl-cyrus-openssl-debian10-clang-compile + run_on: debian10-large + tags: [cse-matrix-openssl, compile, debian10, clang, cse, sasl-cyrus] + commands: + - func: find-cmake-latest + - func: cse-sasl-cyrus-openssl-compile + vars: + CC: clang + - func: upload-build - name: cse-sasl-cyrus-openssl-debian10-gcc-compile run_on: debian10-large tags: [cse-matrix-openssl, compile, debian10, gcc, cse, sasl-cyrus] @@ -1727,6 +1736,15 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-mock-kms-servers - func: run-tests + - name: cse-sasl-cyrus-openssl-debian11-clang-compile + run_on: debian11-large + tags: [cse-matrix-openssl, compile, debian11, clang, cse, sasl-cyrus] + commands: + - func: find-cmake-latest + - func: cse-sasl-cyrus-openssl-compile + vars: + CC: clang + - func: upload-build - name: cse-sasl-cyrus-openssl-debian11-gcc-compile run_on: debian11-large tags: [cse-matrix-openssl, compile, debian11, gcc, cse, sasl-cyrus] @@ -3531,6 +3549,24 @@ tasks: vars: CC: clang - func: upload-build + - name: sasl-cyrus-openssl-debian92-clang-compile + run_on: debian92-large + tags: [sasl-matrix-openssl, compile, debian92, clang, sasl-cyrus] + commands: + - func: find-cmake-latest + - func: sasl-cyrus-openssl-compile + vars: + CC: clang + - func: upload-build + - name: sasl-cyrus-openssl-debian92-gcc-compile + run_on: debian92-large + tags: [sasl-matrix-openssl, compile, debian92, gcc, sasl-cyrus] + commands: + - func: find-cmake-latest + - func: sasl-cyrus-openssl-compile + vars: + CC: gcc + - func: upload-build - name: sasl-cyrus-openssl-debian92-gcc-compile run_on: debian92-large tags: [sasl-matrix-openssl, compile, debian92, gcc, sasl-cyrus] diff --git a/.evergreen/generated_configs/variants.yml b/.evergreen/generated_configs/variants.yml index 8a533043807..91def8ef5f2 100644 --- a/.evergreen/generated_configs/variants.yml +++ b/.evergreen/generated_configs/variants.yml @@ -101,10 +101,12 @@ buildvariants: expansions: CLIENT_SIDE_ENCRYPTION: "on" tasks: - - name: cse-sasl-cyrus-openssl-debian10-gcc-compile - - name: cse-sasl-cyrus-openssl-debian11-gcc-compile - name: cse-sasl-cyrus-openssl-debian92-clang-compile - name: cse-sasl-cyrus-openssl-debian92-gcc-compile + - name: cse-sasl-cyrus-openssl-debian10-clang-compile + - name: cse-sasl-cyrus-openssl-debian10-gcc-compile + - name: cse-sasl-cyrus-openssl-debian11-clang-compile + - name: cse-sasl-cyrus-openssl-debian11-gcc-compile - name: cse-sasl-cyrus-openssl-rhel80-gcc-compile - name: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-compile batchtime: 1440 @@ -223,6 +225,8 @@ buildvariants: display_name: sasl-matrix-openssl expansions: {} tasks: + - name: sasl-cyrus-openssl-debian92-clang-compile + - name: sasl-cyrus-openssl-debian92-gcc-compile - name: sasl-cyrus-openssl-debian10-gcc-compile - name: sasl-cyrus-openssl-debian11-gcc-compile - name: sasl-cyrus-openssl-debian92-clang-compile From d5070def6d571f963a2430be9d6cbd5c8cd2578e Mon Sep 17 00:00:00 2001 From: Ezra Chung Date: Tue, 28 Jan 2025 12:22:01 -0600 Subject: [PATCH 2/4] Add JIRA ticket reference for Debian 10 removal --- .evergreen/config_generator/etc/distros.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.evergreen/config_generator/etc/distros.py b/.evergreen/config_generator/etc/distros.py index c47c8482efe..da1d3956c04 100644 --- a/.evergreen/config_generator/etc/distros.py +++ b/.evergreen/config_generator/etc/distros.py @@ -45,8 +45,8 @@ def validate_os_ver(cls, value): DEBIAN_DISTROS = [ Distro(name='debian92-large', os='debian', os_type='linux', os_ver='9.2', size='large'), # CDRIVER-5873 Distro(name='debian92-small', os='debian', os_type='linux', os_ver='9.2', size='small'), # CDRIVER-5873 - Distro(name='debian10-large', os='debian', os_type='linux', os_ver='10', size='large'), - Distro(name='debian10-small', os='debian', os_type='linux', os_ver='10', size='small'), + Distro(name='debian10-large', os='debian', os_type='linux', os_ver='10', size='large'), # CDRIVER-5874 + Distro(name='debian10-small', os='debian', os_type='linux', os_ver='10', size='small'), # CDRIVER-5874 Distro(name='debian11-large', os='debian', os_type='linux', os_ver='11', size='large'), Distro(name='debian11-small', os='debian', os_type='linux', os_ver='11', size='small'), Distro(name='debian92-large', os='debian', os_type='linux', os_ver='9.2', size='large'), From 468b6066ac5d67a89bc3e40998a174d377b11b8f Mon Sep 17 00:00:00 2001 From: Ezra Chung Date: Tue, 28 Jan 2025 12:22:01 -0600 Subject: [PATCH 3/4] Add deprecation notices for Debian 9 and Debian 10 --- NEWS | 4 ++++ src/libbson/NEWS | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/NEWS b/NEWS index 7b10743b4af..eae7a02e648 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,10 @@ libmongoc 1.29.2 ================ +Deprecated: + + * Support for Debian 9 and Debian 10. + Fixes: * Rename `set_error` function to avoid symbol conflicts. * Fix Windows ARM 64 build. diff --git a/src/libbson/NEWS b/src/libbson/NEWS index 381a4782323..ed310b2abd4 100644 --- a/src/libbson/NEWS +++ b/src/libbson/NEWS @@ -1,6 +1,10 @@ libbson 1.30.0 (Unreleased) =========================== +Deprecated: + + * Support for Debian 9 and Debian 10. + Fixes: * Truncated output of `bson_as_json_with_opts` is changed to no longer split valid UTF-8 sequences. From 7921797737afd10c715dd2aa42ad66834259a7f3 Mon Sep 17 00:00:00 2001 From: Ezra Chung Date: Tue, 28 Jan 2025 12:48:01 -0600 Subject: [PATCH 4/4] Fix duplicate debian92 task entries --- .../config_generator/components/cse/openssl.py | 1 - .../components/sasl/openssl.py | 2 -- .evergreen/generated_configs/tasks.yml | 18 ------------------ .evergreen/generated_configs/variants.yml | 2 -- 4 files changed, 23 deletions(-) diff --git a/.evergreen/config_generator/components/cse/openssl.py b/.evergreen/config_generator/components/cse/openssl.py index 91f2df54012..f8bd0c18abd 100644 --- a/.evergreen/config_generator/components/cse/openssl.py +++ b/.evergreen/config_generator/components/cse/openssl.py @@ -21,7 +21,6 @@ ('debian10', 'gcc', None, ['cyrus']), ('debian11', 'clang', None, ['cyrus']), ('debian11', 'gcc', None, ['cyrus']), - ('rhel80', 'gcc', None, ['cyrus']), ('rhel8-zseries', 'gcc', None, ['cyrus']), ('ubuntu2004', 'clang', None, ['cyrus']), diff --git a/.evergreen/config_generator/components/sasl/openssl.py b/.evergreen/config_generator/components/sasl/openssl.py index 9cef95554e5..c678f70a9f1 100644 --- a/.evergreen/config_generator/components/sasl/openssl.py +++ b/.evergreen/config_generator/components/sasl/openssl.py @@ -21,8 +21,6 @@ ('debian92', 'gcc', None, ['cyrus']), ('debian10', 'gcc', None, ['cyrus']), ('debian11', 'gcc', None, ['cyrus']), - ('debian92', 'clang', None, ['cyrus']), - ('debian92', 'gcc', None, ['cyrus']), ('rhel80', 'gcc', None, ['cyrus']), ('rhel8-power', 'gcc', None, ['cyrus']), ('rhel8-zseries', 'gcc', None, ['cyrus']), diff --git a/.evergreen/generated_configs/tasks.yml b/.evergreen/generated_configs/tasks.yml index 9ca58b4d1d2..c75cbc5c250 100644 --- a/.evergreen/generated_configs/tasks.yml +++ b/.evergreen/generated_configs/tasks.yml @@ -3549,24 +3549,6 @@ tasks: vars: CC: clang - func: upload-build - - name: sasl-cyrus-openssl-debian92-clang-compile - run_on: debian92-large - tags: [sasl-matrix-openssl, compile, debian92, clang, sasl-cyrus] - commands: - - func: find-cmake-latest - - func: sasl-cyrus-openssl-compile - vars: - CC: clang - - func: upload-build - - name: sasl-cyrus-openssl-debian92-gcc-compile - run_on: debian92-large - tags: [sasl-matrix-openssl, compile, debian92, gcc, sasl-cyrus] - commands: - - func: find-cmake-latest - - func: sasl-cyrus-openssl-compile - vars: - CC: gcc - - func: upload-build - name: sasl-cyrus-openssl-debian92-gcc-compile run_on: debian92-large tags: [sasl-matrix-openssl, compile, debian92, gcc, sasl-cyrus] diff --git a/.evergreen/generated_configs/variants.yml b/.evergreen/generated_configs/variants.yml index 91def8ef5f2..7d354eee1de 100644 --- a/.evergreen/generated_configs/variants.yml +++ b/.evergreen/generated_configs/variants.yml @@ -229,8 +229,6 @@ buildvariants: - name: sasl-cyrus-openssl-debian92-gcc-compile - name: sasl-cyrus-openssl-debian10-gcc-compile - name: sasl-cyrus-openssl-debian11-gcc-compile - - 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-rhel8-power-gcc-compile batchtime: 1440