Skip to content

Commit 953a439

Browse files
committed
CDRIVER-5873 restore compile-only coverage on Debian 9.2
1 parent 0288459 commit 953a439

File tree

7 files changed

+71
-6
lines changed

7 files changed

+71
-6
lines changed

.evergreen/config_generator/components/c_std_compile.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
# pylint: disable=line-too-long
1818
# fmt: off
1919
MATRIX = [
20+
('debian92', 'clang', None, [11, ]),
2021
('debian10', 'clang', None, [11, ]),
2122
('debian10', 'gcc', None, [11, 17]),
2223
('debian11', 'clang', None, [11, ]),

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,13 @@
1515
# pylint: disable=line-too-long
1616
# fmt: off
1717
COMPILE_MATRIX = [
18-
('debian10', 'clang', None, ['cyrus']),
19-
('debian10', 'gcc', None, ['cyrus']),
20-
('debian11', 'clang', None, ['cyrus']),
21-
('debian11', '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']),
24+
2225
('rhel80', 'gcc', None, ['cyrus']),
2326
('rhel8-zseries', 'gcc', None, ['cyrus']),
2427
('ubuntu2004', 'clang', None, ['cyrus']),
@@ -31,7 +34,7 @@
3134
TEST_MATRIX = [
3235
# 4.2 and 4.4 not available on rhel8-zseries.
3336
('rhel8-zseries', 'gcc', None, 'cyrus', ['auth'], ['server'], ['5.0']),
34-
37+
3538
('windows-vsCurrent', 'vs2017x64', None, 'cyrus', ['auth'], ['server'], ['4.2', '4.4', '5.0', '6.0' ]),
3639

3740
# 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 @@
4245

4346
# Test 4.2 with Debian 10 since 4.2 does not ship on Ubuntu 20.04+.
4447
('debian10', 'gcc', None, 'cyrus', ['auth'], ['server', 'replica'], ['4.2']),
45-
4648
]
4749
# fmt: on
4850
# pylint: enable=line-too-long

.evergreen/config_generator/components/openssl_static_compile.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
# pylint: disable=line-too-long
1818
# fmt: off
1919
MATRIX = [
20+
('debian92', 'gcc', None),
2021
('debian10', 'gcc', None),
2122
('debian11', 'gcc', None),
2223
('ubuntu2004', 'gcc', None),

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
# pylint: disable=line-too-long
1818
# fmt: off
1919
COMPILE_MATRIX = [
20+
('debian92', 'clang', None, ['cyrus']),
21+
('debian92', 'gcc', None, ['cyrus']),
2022
('debian10', 'gcc', None, ['cyrus']),
2123
('debian10', 'clang', None, ['cyrus']),
2224
('debian11', 'gcc', None, ['cyrus']),

.evergreen/config_generator/etc/distros.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ def validate_os_ver(cls, value):
4343
# pylint: disable=line-too-long
4444
#fmt: off
4545
DEBIAN_DISTROS = [
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
4648
Distro(name='debian10-large', os='debian', os_type='linux', os_ver='10', size='large'),
4749
Distro(name='debian10-small', os='debian', os_type='linux', os_ver='10', size='small'),
4850
Distro(name='debian11-large', os='debian', os_type='linux', os_ver='11', size='large'),

.evergreen/generated_configs/tasks.yml

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1754,6 +1754,24 @@ tasks:
17541754
vars:
17551755
CC: gcc
17561756
- func: upload-build
1757+
- name: cse-sasl-cyrus-openssl-debian92-clang-compile
1758+
run_on: debian92-large
1759+
tags: [cse-matrix-openssl, compile, debian92, clang, cse, sasl-cyrus]
1760+
commands:
1761+
- func: find-cmake-latest
1762+
- func: cse-sasl-cyrus-openssl-compile
1763+
vars:
1764+
CC: clang
1765+
- func: upload-build
1766+
- name: cse-sasl-cyrus-openssl-debian92-gcc-compile
1767+
run_on: debian92-large
1768+
tags: [cse-matrix-openssl, compile, debian92, gcc, cse, sasl-cyrus]
1769+
commands:
1770+
- func: find-cmake-latest
1771+
- func: cse-sasl-cyrus-openssl-compile
1772+
vars:
1773+
CC: gcc
1774+
- func: upload-build
17571775
- name: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-compile
17581776
run_on: rhel8-zseries-large
17591777
tags: [cse-matrix-openssl, compile, rhel8-zseries, gcc, cse, sasl-cyrus]
@@ -3181,6 +3199,14 @@ tasks:
31813199
- func: openssl-static-compile
31823200
vars:
31833201
CC: gcc
3202+
- name: openssl-static-compile-debian92-gcc
3203+
run_on: debian92-large
3204+
tags: [openssl-static-matrix, debian92, gcc]
3205+
commands:
3206+
- func: find-cmake-latest
3207+
- func: openssl-static-compile
3208+
vars:
3209+
CC: gcc
31843210
- name: openssl-static-compile-ubuntu2004-gcc
31853211
run_on: ubuntu2004-large
31863212
tags: [openssl-static-matrix, ubuntu2004, gcc]
@@ -3532,6 +3558,24 @@ tasks:
35323558
vars:
35333559
CC: gcc
35343560
- func: upload-build
3561+
- name: sasl-cyrus-openssl-debian92-clang-compile
3562+
run_on: debian92-large
3563+
tags: [sasl-matrix-openssl, compile, debian92, clang, sasl-cyrus]
3564+
commands:
3565+
- func: find-cmake-latest
3566+
- func: sasl-cyrus-openssl-compile
3567+
vars:
3568+
CC: clang
3569+
- func: upload-build
3570+
- name: sasl-cyrus-openssl-debian92-gcc-compile
3571+
run_on: debian92-large
3572+
tags: [sasl-matrix-openssl, compile, debian92, gcc, sasl-cyrus]
3573+
commands:
3574+
- func: find-cmake-latest
3575+
- func: sasl-cyrus-openssl-compile
3576+
vars:
3577+
CC: gcc
3578+
- func: upload-build
35353579
- name: sasl-cyrus-openssl-rhel8-power-gcc-compile
35363580
run_on: rhel8-power-large
35373581
tags: [sasl-matrix-openssl, compile, rhel8-power, gcc, sasl-cyrus]
@@ -4972,6 +5016,15 @@ tasks:
49725016
vars:
49735017
CC: gcc
49745018
C_STD_VERSION: 11
5019+
- name: std-c11-debian92-clang-compile
5020+
run_on: debian92-large
5021+
tags: [std-matrix, debian92, clang, compile, std-c11]
5022+
commands:
5023+
- func: find-cmake-latest
5024+
- func: std-compile
5025+
vars:
5026+
CC: clang
5027+
C_STD_VERSION: 11
49755028
- name: std-c11-ubuntu2004-clang-compile
49765029
run_on: ubuntu2004-large
49775030
tags: [std-matrix, ubuntu2004, clang, compile, std-c11]

.evergreen/generated_configs/variants.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,8 @@ buildvariants:
101101
expansions:
102102
CLIENT_SIDE_ENCRYPTION: "on"
103103
tasks:
104+
- name: cse-sasl-cyrus-openssl-debian92-clang-compile
105+
- name: cse-sasl-cyrus-openssl-debian92-gcc-compile
104106
- name: cse-sasl-cyrus-openssl-debian10-clang-compile
105107
- name: cse-sasl-cyrus-openssl-debian10-gcc-compile
106108
- name: cse-sasl-cyrus-openssl-debian11-clang-compile
@@ -223,6 +225,8 @@ buildvariants:
223225
display_name: sasl-matrix-openssl
224226
expansions: {}
225227
tasks:
228+
- name: sasl-cyrus-openssl-debian92-clang-compile
229+
- name: sasl-cyrus-openssl-debian92-gcc-compile
226230
- name: sasl-cyrus-openssl-debian10-gcc-compile
227231
- name: sasl-cyrus-openssl-debian10-clang-compile
228232
- name: sasl-cyrus-openssl-debian11-gcc-compile

0 commit comments

Comments
 (0)