Skip to content

Commit 4b4aade

Browse files
eramongodberamongodb
authored
CDRIVER-5873 reduce Debian 9 task coverage to compile-only (#1839)
* Add JIRA ticket references for Debian 9 and Debian 10 removal * Add deprecation notices for Debian 9 and Debian 10
1 parent 3e3717d commit 4b4aade

File tree

7 files changed

+45
-14
lines changed

7 files changed

+45
-14
lines changed

‎.evergreen/config_generator/components/cse/openssl.py‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,12 @@
1515
# pylint: disable=line-too-long
1616
# fmt: off
1717
COMPILE_MATRIX = [
18-
('debian10', 'gcc', None, ['cyrus']),
19-
('debian11', 'gcc', None, ['cyrus']),
20-
('debian92', 'clang', None, ['cyrus']),
21-
('debian92', 'gcc', None, ['cyrus']),
18+
('debian92', 'clang', None, ['cyrus']),
19+
('debian92', 'gcc', None, ['cyrus']),
20+
('debian10', 'clang', None, ['cyrus']),
21+
('debian10', 'gcc', None, ['cyrus']),
22+
('debian11', 'clang', None, ['cyrus']),
23+
('debian11', 'gcc', None, ['cyrus']),
2224
('rhel80', 'gcc', None, ['cyrus']),
2325
('rhel8-zseries', 'gcc', None, ['cyrus']),
2426
('ubuntu2004', 'clang', None, ['cyrus']),
@@ -31,7 +33,7 @@
3133
TEST_MATRIX = [
3234
# 4.2 and 4.4 not available on rhel8-zseries.
3335
('rhel8-zseries', 'gcc', None, 'cyrus', ['auth'], ['server'], ['5.0']),
34-
36+
3537
('windows-vsCurrent', 'vs2017x64', None, 'cyrus', ['auth'], ['server'], ['4.2', '4.4', '5.0', '6.0' ]),
3638

3739
# Test 7.0+ with a replica set since Queryable Encryption does not support the 'server' topology. Queryable Encryption tests require 7.0+.
@@ -42,7 +44,6 @@
4244

4345
# Test 4.2 with Debian 10 since 4.2 does not ship on Ubuntu 20.04+.
4446
('debian10', 'gcc', None, 'cyrus', ['auth'], ['server', 'replica'], ['4.2']),
45-
4647
]
4748
# fmt: on
4849
# pylint: enable=line-too-long

‎.evergreen/config_generator/components/sasl/openssl.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
# pylint: disable=line-too-long
1818
# fmt: off
1919
COMPILE_MATRIX = [
20-
('debian10', 'gcc', None, ['cyrus']),
21-
('debian11', 'gcc', None, ['cyrus']),
2220
('debian92', 'clang', None, ['cyrus']),
2321
('debian92', 'gcc', None, ['cyrus']),
22+
('debian10', 'gcc', None, ['cyrus']),
23+
('debian11', 'gcc', None, ['cyrus']),
2424
('rhel80', 'gcc', None, ['cyrus']),
2525
('rhel8-power', 'gcc', None, ['cyrus']),
2626
('rhel8-zseries', 'gcc', None, ['cyrus']),

‎.evergreen/config_generator/etc/distros.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,10 @@ def validate_os_ver(cls, value):
4343
# pylint: disable=line-too-long
4444
#fmt: off
4545
DEBIAN_DISTROS = [
46-
Distro(name='debian10-large', os='debian', os_type='linux', os_ver='10', size='large'),
47-
Distro(name='debian10-small', os='debian', os_type='linux', os_ver='10', size='small'),
46+
Distro(name='debian92-large', os='debian', os_type='linux', os_ver='9.2', size='large'), # CDRIVER-5873
47+
Distro(name='debian92-small', os='debian', os_type='linux', os_ver='9.2', size='small'), # CDRIVER-5873
48+
Distro(name='debian10-large', os='debian', os_type='linux', os_ver='10', size='large'), # CDRIVER-5874
49+
Distro(name='debian10-small', os='debian', os_type='linux', os_ver='10', size='small'), # CDRIVER-5874
4850
Distro(name='debian11-large', os='debian', os_type='linux', os_ver='11', size='large'),
4951
Distro(name='debian11-small', os='debian', os_type='linux', os_ver='11', size='small'),
5052
Distro(name='debian92-large', os='debian', os_type='linux', os_ver='9.2', size='large'),

‎.evergreen/generated_configs/tasks.yml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1678,6 +1678,15 @@ tasks:
16781678
- func: bootstrap-mongo-orchestration
16791679
- func: run-mock-kms-servers
16801680
- func: run-tests
1681+
- name: cse-sasl-cyrus-openssl-debian10-clang-compile
1682+
run_on: debian10-large
1683+
tags: [cse-matrix-openssl, compile, debian10, clang, cse, sasl-cyrus]
1684+
commands:
1685+
- func: find-cmake-latest
1686+
- func: cse-sasl-cyrus-openssl-compile
1687+
vars:
1688+
CC: clang
1689+
- func: upload-build
16811690
- name: cse-sasl-cyrus-openssl-debian10-gcc-compile
16821691
run_on: debian10-large
16831692
tags: [cse-matrix-openssl, compile, debian10, gcc, cse, sasl-cyrus]
@@ -1727,6 +1736,15 @@ tasks:
17271736
- func: bootstrap-mongo-orchestration
17281737
- func: run-mock-kms-servers
17291738
- func: run-tests
1739+
- name: cse-sasl-cyrus-openssl-debian11-clang-compile
1740+
run_on: debian11-large
1741+
tags: [cse-matrix-openssl, compile, debian11, clang, cse, sasl-cyrus]
1742+
commands:
1743+
- func: find-cmake-latest
1744+
- func: cse-sasl-cyrus-openssl-compile
1745+
vars:
1746+
CC: clang
1747+
- func: upload-build
17301748
- name: cse-sasl-cyrus-openssl-debian11-gcc-compile
17311749
run_on: debian11-large
17321750
tags: [cse-matrix-openssl, compile, debian11, gcc, cse, sasl-cyrus]

‎.evergreen/generated_configs/variants.yml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,12 @@ buildvariants:
101101
expansions:
102102
CLIENT_SIDE_ENCRYPTION: "on"
103103
tasks:
104-
- name: cse-sasl-cyrus-openssl-debian10-gcc-compile
105-
- name: cse-sasl-cyrus-openssl-debian11-gcc-compile
106104
- name: cse-sasl-cyrus-openssl-debian92-clang-compile
107105
- name: cse-sasl-cyrus-openssl-debian92-gcc-compile
106+
- name: cse-sasl-cyrus-openssl-debian10-clang-compile
107+
- name: cse-sasl-cyrus-openssl-debian10-gcc-compile
108+
- name: cse-sasl-cyrus-openssl-debian11-clang-compile
109+
- name: cse-sasl-cyrus-openssl-debian11-gcc-compile
108110
- name: cse-sasl-cyrus-openssl-rhel80-gcc-compile
109111
- name: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-compile
110112
batchtime: 1440
@@ -223,10 +225,10 @@ buildvariants:
223225
display_name: sasl-matrix-openssl
224226
expansions: {}
225227
tasks:
226-
- name: sasl-cyrus-openssl-debian10-gcc-compile
227-
- name: sasl-cyrus-openssl-debian11-gcc-compile
228228
- name: sasl-cyrus-openssl-debian92-clang-compile
229229
- name: sasl-cyrus-openssl-debian92-gcc-compile
230+
- name: sasl-cyrus-openssl-debian10-gcc-compile
231+
- name: sasl-cyrus-openssl-debian11-gcc-compile
230232
- name: sasl-cyrus-openssl-rhel80-gcc-compile
231233
- name: sasl-cyrus-openssl-rhel8-power-gcc-compile
232234
batchtime: 1440

‎NEWS‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
libmongoc 1.29.2
22
================
33

4+
Deprecated:
5+
6+
* Support for Debian 9 and Debian 10.
7+
48
Fixes:
59
* Rename `set_error` function to avoid symbol conflicts.
610
* Fix Windows ARM 64 build.

‎src/libbson/NEWS‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
libbson 1.30.0 (Unreleased)
22
===========================
33

4+
Deprecated:
5+
6+
* Support for Debian 9 and Debian 10.
7+
48
Fixes:
59

610
* Truncated output of `bson_as_json_with_opts` is changed to no longer split valid UTF-8 sequences.

0 commit comments

Comments
 (0)