Skip to content

Commit a194bc6

Browse files
authored
Drop obsolete distros from Evergreen config (#1448)
* CDRIVER-4591 macos-1014 -> macos-1100 in Evergreen config Also, no x509 SSL client auth test on darwin * CDRIVER-4660 drop ubuntu1404 from Evergreen config * CDRIVER-4661 drop debian8 from Evergreen config * CDRIVER-4591 macos-1014 -> macos-1100 in Evergreen config, 2 * Document the obsolete platforms that were dropped
1 parent b5a2a40 commit a194bc6

File tree

13 files changed

+32
-176
lines changed

13 files changed

+32
-176
lines changed

.evergreen/config_generator/components/c_std_compile.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
# fmt: off
1818
MATRIX = [
1919
('archlinux', 'clang', None, [11, ]),
20-
('debian81', 'clang', None, [11, ]),
2120
('debian92', 'clang', None, [11, ]),
2221
('ubuntu1604', 'clang', 'i686', [11, ]),
2322
('ubuntu1604', 'clang', None, [11, ]),

.evergreen/config_generator/components/sasl/darwinssl.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
# pylint: disable=line-too-long
1616
# fmt: off
1717
COMPILE_MATRIX = [
18-
('macos-1014', 'clang', None, ['cyrus']),
19-
('macos-1015', 'clang', None, ['cyrus']),
2018
('macos-1100', 'clang', None, ['cyrus']),
2119
('macos-1100-arm64', 'clang', None, ['cyrus']),
2220
]
@@ -53,11 +51,6 @@ def tasks():
5351
res += generate_compile_tasks(SSL, TAG, SASL_TO_FUNC, COMPILE_MATRIX)
5452
res += generate_test_tasks(SSL, TAG, TEST_MATRIX)
5553

56-
# TODO: remove once MONGOCRYPT-443 is resolved.
57-
for task in res:
58-
if task.run_on == 'macos-1015':
59-
task.disable = True
60-
6154
return res
6255

6356

.evergreen/config_generator/components/sasl/nossl.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
# pylint: disable=line-too-long
1616
# fmt: off
1717
COMPILE_MATRIX = [
18-
('macos-1014', 'clang', None, ['off']),
1918
('ubuntu1604', 'gcc', None, ['off']),
2019
('ubuntu1804', 'gcc', None, ['off']),
2120
('ubuntu2004', 'gcc', None, ['off']),

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,12 @@
1919
('archlinux', 'gcc', None, ['cyrus']),
2020
('debian10', 'gcc', None, ['cyrus']),
2121
('debian11', 'gcc', None, ['cyrus']),
22-
('debian81', 'clang', None, ['cyrus']),
23-
('debian81', 'gcc', None, ['cyrus']),
2422
('debian92', 'clang', None, ['cyrus']),
2523
('debian92', 'gcc', None, ['cyrus']),
2624
('rhel70', 'gcc', None, ['cyrus']),
2725
('rhel80', 'gcc', None, ['cyrus']),
2826
('rhel81-power8', 'gcc', None, ['cyrus']),
2927
('rhel83-zseries', 'gcc', None, ['cyrus']),
30-
('ubuntu1404', 'clang', None, ['cyrus']),
31-
('ubuntu1404', 'gcc', None, ['cyrus']),
3228
('ubuntu1604-arm64', 'gcc', None, ['cyrus']),
3329
('ubuntu1604', 'clang', None, ['cyrus']),
3430
('ubuntu1804-arm64', 'gcc', None, ['cyrus']),

.evergreen/config_generator/components/scan_build.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,6 @@ def tasks():
8080
)
8181
)
8282

83-
# TODO: remove once BUILD-16814 is resolved.
84-
for task in res:
85-
if task.run_on == 'macos-1014':
86-
task.disable = True
87-
8883
return res
8984

9085

.evergreen/config_generator/etc/distros.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,16 +54,11 @@ def validate_os_ver(cls, value):
5454
Distro(name='debian10-small', os='debian', os_type='linux', os_ver='10', size='small'),
5555
Distro(name='debian11-large', os='debian', os_type='linux', os_ver='11', size='large'),
5656
Distro(name='debian11-small', os='debian', os_type='linux', os_ver='11', size='small'),
57-
Distro(name='debian81-large', os='debian', os_type='linux', os_ver='8.1', size='large'),
58-
Distro(name='debian81-small', os='debian', os_type='linux', os_ver='8.1', size='small'),
5957
Distro(name='debian92-large', os='debian', os_type='linux', os_ver='9.2', size='large'),
6058
Distro(name='debian92-small', os='debian', os_type='linux', os_ver='9.2', size='small'),
6159
]
6260

6361
MACOS_DISTROS = [
64-
Distro(name='macos-1012', os='macos', os_type='macos', os_ver='10.12'),
65-
Distro(name='macos-1014', os='macos', os_type='macos', os_ver='10.14'),
66-
Distro(name='macos-1015', os='macos', os_type='macos', os_ver='10.15'),
6762
Distro(name='macos-1100', os='macos', os_type='macos', os_ver='11.00'),
6863
]
6964

@@ -110,8 +105,6 @@ def validate_os_ver(cls, value):
110105
]
111106

112107
UBUNTU_DISTROS = [
113-
Distro(name='ubuntu1404-large', os='ubuntu', os_type='linux', os_ver='14.04', size='large'),
114-
Distro(name='ubuntu1404-small', os='ubuntu', os_type='linux', os_ver='14.04', size='small'),
115108
Distro(name='ubuntu1604-large', os='ubuntu', os_type='linux', os_ver='16.04', size='large'),
116109
Distro(name='ubuntu1604-small', os='ubuntu', os_type='linux', os_ver='16.04', size='small'),
117110
Distro(name='ubuntu1804-large', os='ubuntu', os_type='linux', os_ver='18.04', size='large'),

.evergreen/generated_configs/legacy-config.yml

Lines changed: 7 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -14010,10 +14010,10 @@ buildvariants:
1401014010
- link-with-cmake-snappy-deprecated
1401114011
- name: link-with-cmake-mac
1401214012
distros:
14013-
- macos-1014
14013+
- macos-1100
1401414014
- name: link-with-cmake-mac-deprecated
1401514015
distros:
14016-
- macos-1014
14016+
- macos-1100
1401714017
- name: link-with-cmake-windows
1401814018
distros:
1401914019
- windows-vsCurrent-large
@@ -14031,15 +14031,15 @@ buildvariants:
1403114031
- ubuntu1804-test
1403214032
- name: link-with-pkg-config-mac
1403314033
distros:
14034-
- macos-1014
14034+
- macos-1100
1403514035
- link-with-pkg-config-ssl
1403614036
- link-with-bson
1403714037
- name: link-with-bson-windows
1403814038
distros:
1403914039
- windows-vsCurrent-large
1404014040
- name: link-with-bson-mac
1404114041
distros:
14042-
- macos-1014
14042+
- macos-1100
1404314043
- name: link-with-bson-mingw
1404414044
distros:
1404514045
- windows-vsCurrent-large
@@ -14058,24 +14058,6 @@ buildvariants:
1405814058
- install-libmongoc-after-libbson
1405914059
tags:
1406014060
- pr-merge-gate
14061-
- name: clang34ubuntu
14062-
display_name: clang 3.4 (Ubuntu 14.04)
14063-
expansions:
14064-
CC: clang
14065-
run_on: ubuntu1404-build
14066-
tasks:
14067-
- release-compile
14068-
- debug-compile-rdtscp
14069-
- name: clang35
14070-
display_name: clang 3.5 (Debian 8.1)
14071-
expansions:
14072-
CC: clang
14073-
run_on: debian81-test
14074-
tasks:
14075-
- release-compile
14076-
- debug-compile-sasl-openssl
14077-
- debug-compile-nosasl-openssl
14078-
- .authentication-tests .openssl
1407914061
- name: clang38
1408014062
display_name: clang 3.8 (Debian 9.2)
1408114063
expansions:
@@ -14139,13 +14121,6 @@ buildvariants:
1413914121
- debug-compile-nosasl-openssl
1414014122
- debug-compile-no-align
1414114123
- .authentication-tests .openssl
14142-
- name: gcc48ubuntu
14143-
display_name: GCC 4.8 (Ubuntu 14.04)
14144-
expansions:
14145-
CC: gcc
14146-
run_on: ubuntu1404-build
14147-
tasks:
14148-
- release-compile
1414914124
- name: gcc82rhel
1415014125
display_name: GCC 8.2 (RHEL 8.0)
1415114126
expansions:
@@ -14174,16 +14149,6 @@ buildvariants:
1417414149
- debug-compile-nosasl-openssl
1417514150
- .authentication-tests .openssl
1417614151
- .latest .nossl
14177-
- name: gcc49
14178-
display_name: GCC 4.9 (Debian 8.1)
14179-
expansions:
14180-
CC: gcc
14181-
run_on: debian81-test
14182-
tasks:
14183-
- release-compile
14184-
- debug-compile-sasl-openssl
14185-
- debug-compile-nosasl-openssl
14186-
- .authentication-tests .openssl
1418714152
- name: gcc63
1418814153
display_name: GCC 6.3 (Debian 9.2)
1418914154
expansions:
@@ -14266,7 +14231,7 @@ buildvariants:
1426614231
display_name: '*Darwin, macOS (Apple LLVM)'
1426714232
expansions:
1426814233
CC: clang
14269-
run_on: macos-1014
14234+
run_on: macos-1100
1427014235
tasks:
1427114236
- .compression !.snappy
1427214237
- release-compile
@@ -14462,14 +14427,14 @@ buildvariants:
1446214427
- name: debug-compile-nosasl-openssl-static
1446314428
- name: debug-compile-nosasl-darwinssl
1446414429
distros:
14465-
- macos-1014
14430+
- macos-1100
1446614431
- name: debug-compile-nosasl-winssl
1446714432
distros:
1446814433
- windows-vsCurrent-large
1446914434
- name: .ocsp-openssl
1447014435
- name: .ocsp-darwinssl
1447114436
distros:
14472-
- macos-1014
14437+
- macos-1100
1447314438
- name: .ocsp-winssl
1447414439
distros:
1447514440
- windows-vsCurrent-large

.evergreen/generated_configs/tasks.yml

Lines changed: 0 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -2535,23 +2535,6 @@ tasks:
25352535
- func: openssl-static-compile
25362536
vars:
25372537
CC: gcc
2538-
- name: sasl-cyrus-darwinssl-macos-1014-clang-compile
2539-
run_on: macos-1014
2540-
tags: [sasl-matrix-darwinssl, compile, macos-1014, clang, sasl-cyrus]
2541-
commands:
2542-
- func: sasl-cyrus-darwinssl-compile
2543-
vars:
2544-
CC: clang
2545-
- func: upload-build
2546-
- name: sasl-cyrus-darwinssl-macos-1015-clang-compile
2547-
run_on: macos-1015
2548-
tags: [sasl-matrix-darwinssl, compile, macos-1015, clang, sasl-cyrus]
2549-
disable: true
2550-
commands:
2551-
- func: sasl-cyrus-darwinssl-compile
2552-
vars:
2553-
CC: clang
2554-
- func: upload-build
25552538
- name: sasl-cyrus-darwinssl-macos-1100-arm64-clang-compile
25562539
run_on: macos-1100-arm64
25572540
tags: [sasl-matrix-darwinssl, compile, macos-1100-arm64, clang, sasl-cyrus]
@@ -2760,22 +2743,6 @@ tasks:
27602743
vars:
27612744
CC: gcc
27622745
- func: upload-build
2763-
- name: sasl-cyrus-openssl-debian81-clang-compile
2764-
run_on: debian81-large
2765-
tags: [sasl-matrix-openssl, compile, debian81, clang, sasl-cyrus]
2766-
commands:
2767-
- func: sasl-cyrus-openssl-compile
2768-
vars:
2769-
CC: clang
2770-
- func: upload-build
2771-
- name: sasl-cyrus-openssl-debian81-gcc-compile
2772-
run_on: debian81-large
2773-
tags: [sasl-matrix-openssl, compile, debian81, gcc, sasl-cyrus]
2774-
commands:
2775-
- func: sasl-cyrus-openssl-compile
2776-
vars:
2777-
CC: gcc
2778-
- func: upload-build
27792746
- name: sasl-cyrus-openssl-debian92-clang-compile
27802747
run_on: debian92-large
27812748
tags: [sasl-matrix-openssl, compile, debian92, clang, sasl-cyrus]
@@ -3024,22 +2991,6 @@ tasks:
30242991
- func: bootstrap-mongo-orchestration
30252992
- func: run-simple-http-server
30262993
- func: run-tests
3027-
- name: sasl-cyrus-openssl-ubuntu1404-clang-compile
3028-
run_on: ubuntu1404-large
3029-
tags: [sasl-matrix-openssl, compile, ubuntu1404, clang, sasl-cyrus]
3030-
commands:
3031-
- func: sasl-cyrus-openssl-compile
3032-
vars:
3033-
CC: clang
3034-
- func: upload-build
3035-
- name: sasl-cyrus-openssl-ubuntu1404-gcc-compile
3036-
run_on: ubuntu1404-large
3037-
tags: [sasl-matrix-openssl, compile, ubuntu1404, gcc, sasl-cyrus]
3038-
commands:
3039-
- func: sasl-cyrus-openssl-compile
3040-
vars:
3041-
CC: gcc
3042-
- func: upload-build
30432994
- name: sasl-cyrus-openssl-ubuntu1604-arm64-gcc-compile
30442995
run_on: ubuntu1604-arm64-large
30452996
tags: [sasl-matrix-openssl, compile, ubuntu1604-arm64, gcc, sasl-cyrus]
@@ -3680,14 +3631,6 @@ tasks:
36803631
- func: bootstrap-mongo-orchestration
36813632
- func: run-simple-http-server
36823633
- func: run-tests
3683-
- name: sasl-off-nossl-macos-1014-clang-compile
3684-
run_on: macos-1014
3685-
tags: [sasl-matrix-nossl, compile, macos-1014, clang, sasl-off]
3686-
commands:
3687-
- func: sasl-off-nossl-compile
3688-
vars:
3689-
CC: clang
3690-
- func: upload-build
36913634
- name: sasl-off-nossl-ubuntu1604-gcc-compile
36923635
run_on: ubuntu1604-large
36933636
tags: [sasl-matrix-nossl, compile, ubuntu1604, gcc, sasl-off]
@@ -4406,14 +4349,6 @@ tasks:
44064349
vars:
44074350
CC: gcc
44084351
C_STD_VERSION: 11
4409-
- name: std-c11-debian81-clang-compile
4410-
run_on: debian81-large
4411-
tags: [std-matrix, debian81, clang, compile, std-c11]
4412-
commands:
4413-
- func: std-compile
4414-
vars:
4415-
CC: clang
4416-
C_STD_VERSION: 11
44174352
- name: std-c11-debian92-clang-compile
44184353
run_on: debian92-large
44194354
tags: [std-matrix, debian92, clang, compile, std-c11]

0 commit comments

Comments
 (0)