Skip to content

CDRIVER-5873 reduce Debian 9 task coverage to compile-only #1839

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jan 28, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions .evergreen/config_generator/components/cse/openssl.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,12 @@
# 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']),
Expand All @@ -31,7 +33,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+.
Expand All @@ -42,7 +44,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
Expand Down
4 changes: 2 additions & 2 deletions .evergreen/config_generator/components/sasl/openssl.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
# 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']),
('debian10', 'gcc', None, ['cyrus']),
('debian11', 'gcc', None, ['cyrus']),
('rhel80', 'gcc', None, ['cyrus']),
('rhel8-power', 'gcc', None, ['cyrus']),
('rhel8-zseries', 'gcc', None, ['cyrus']),
Expand Down
6 changes: 4 additions & 2 deletions .evergreen/config_generator/etc/distros.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,10 @@ def validate_os_ver(cls, value):
# pylint: disable=line-too-long
#fmt: off
DEBIAN_DISTROS = [
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='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'), # 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'),
Expand Down
18 changes: 18 additions & 0 deletions .evergreen/generated_configs/tasks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down Expand Up @@ -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]
Expand Down
10 changes: 6 additions & 4 deletions .evergreen/generated_configs/variants.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -223,10 +225,10 @@ buildvariants:
display_name: sasl-matrix-openssl
expansions: {}
tasks:
- 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-debian10-gcc-compile
- name: sasl-cyrus-openssl-debian11-gcc-compile
- name: sasl-cyrus-openssl-rhel80-gcc-compile
- name: sasl-cyrus-openssl-rhel8-power-gcc-compile
batchtime: 1440
Expand Down
4 changes: 4 additions & 0 deletions NEWS
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
4 changes: 4 additions & 0 deletions src/libbson/NEWS
Original file line number Diff line number Diff line change
@@ -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.
Expand Down