Skip to content
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
1 change: 0 additions & 1 deletion .evergreen/config_generator/components/c_std_compile.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
# fmt: off
MATRIX = [
('archlinux', 'clang', None, [11, ]),
('debian81', 'clang', None, [11, ]),
('debian92', 'clang', None, [11, ]),
('ubuntu1604', 'clang', 'i686', [11, ]),
('ubuntu1604', 'clang', None, [11, ]),
Expand Down
7 changes: 0 additions & 7 deletions .evergreen/config_generator/components/sasl/darwinssl.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@
# pylint: disable=line-too-long
# fmt: off
COMPILE_MATRIX = [
('macos-1014', 'clang', None, ['cyrus']),
('macos-1015', 'clang', None, ['cyrus']),
('macos-1100', 'clang', None, ['cyrus']),
('macos-1100-arm64', 'clang', None, ['cyrus']),
]
Expand Down Expand Up @@ -53,11 +51,6 @@ def tasks():
res += generate_compile_tasks(SSL, TAG, SASL_TO_FUNC, COMPILE_MATRIX)
res += generate_test_tasks(SSL, TAG, TEST_MATRIX)

# TODO: remove once MONGOCRYPT-443 is resolved.
for task in res:
if task.run_on == 'macos-1015':
task.disable = True

return res


Expand Down
1 change: 0 additions & 1 deletion .evergreen/config_generator/components/sasl/nossl.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
# pylint: disable=line-too-long
# fmt: off
COMPILE_MATRIX = [
('macos-1014', 'clang', None, ['off']),
('ubuntu1604', 'gcc', None, ['off']),
('ubuntu1804', 'gcc', None, ['off']),
('ubuntu2004', 'gcc', None, ['off']),
Expand Down
4 changes: 0 additions & 4 deletions .evergreen/config_generator/components/sasl/openssl.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,12 @@
('archlinux', 'gcc', None, ['cyrus']),
('debian10', 'gcc', None, ['cyrus']),
('debian11', 'gcc', None, ['cyrus']),
('debian81', 'clang', None, ['cyrus']),
('debian81', 'gcc', None, ['cyrus']),
('debian92', 'clang', None, ['cyrus']),
('debian92', 'gcc', None, ['cyrus']),
('rhel70', 'gcc', None, ['cyrus']),
('rhel80', 'gcc', None, ['cyrus']),
('rhel81-power8', 'gcc', None, ['cyrus']),
('rhel83-zseries', 'gcc', None, ['cyrus']),
('ubuntu1404', 'clang', None, ['cyrus']),
('ubuntu1404', 'gcc', None, ['cyrus']),
('ubuntu1604-arm64', 'gcc', None, ['cyrus']),
('ubuntu1604', 'clang', None, ['cyrus']),
('ubuntu1804-arm64', 'gcc', None, ['cyrus']),
Expand Down
5 changes: 0 additions & 5 deletions .evergreen/config_generator/components/scan_build.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,6 @@ def tasks():
)
)

# TODO: remove once BUILD-16814 is resolved.
for task in res:
if task.run_on == 'macos-1014':
task.disable = True

return res


Expand Down
7 changes: 0 additions & 7 deletions .evergreen/config_generator/etc/distros.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,16 +54,11 @@ def validate_os_ver(cls, value):
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'),
Distro(name='debian11-small', os='debian', os_type='linux', os_ver='11', size='small'),
Distro(name='debian81-large', os='debian', os_type='linux', os_ver='8.1', size='large'),
Distro(name='debian81-small', os='debian', os_type='linux', os_ver='8.1', size='small'),
Distro(name='debian92-large', os='debian', os_type='linux', os_ver='9.2', size='large'),
Distro(name='debian92-small', os='debian', os_type='linux', os_ver='9.2', size='small'),
]

MACOS_DISTROS = [
Distro(name='macos-1012', os='macos', os_type='macos', os_ver='10.12'),
Distro(name='macos-1014', os='macos', os_type='macos', os_ver='10.14'),
Distro(name='macos-1015', os='macos', os_type='macos', os_ver='10.15'),
Distro(name='macos-1100', os='macos', os_type='macos', os_ver='11.00'),
]

Expand Down Expand Up @@ -110,8 +105,6 @@ def validate_os_ver(cls, value):
]

UBUNTU_DISTROS = [
Distro(name='ubuntu1404-large', os='ubuntu', os_type='linux', os_ver='14.04', size='large'),
Distro(name='ubuntu1404-small', os='ubuntu', os_type='linux', os_ver='14.04', size='small'),
Distro(name='ubuntu1604-large', os='ubuntu', os_type='linux', os_ver='16.04', size='large'),
Distro(name='ubuntu1604-small', os='ubuntu', os_type='linux', os_ver='16.04', size='small'),
Distro(name='ubuntu1804-large', os='ubuntu', os_type='linux', os_ver='18.04', size='large'),
Expand Down
49 changes: 7 additions & 42 deletions .evergreen/generated_configs/legacy-config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14010,10 +14010,10 @@ buildvariants:
- link-with-cmake-snappy-deprecated
- name: link-with-cmake-mac
distros:
- macos-1014
- macos-1100
- name: link-with-cmake-mac-deprecated
distros:
- macos-1014
- macos-1100
- name: link-with-cmake-windows
distros:
- windows-vsCurrent-large
Expand All @@ -14031,15 +14031,15 @@ buildvariants:
- ubuntu1804-test
- name: link-with-pkg-config-mac
distros:
- macos-1014
- macos-1100
- link-with-pkg-config-ssl
- link-with-bson
- name: link-with-bson-windows
distros:
- windows-vsCurrent-large
- name: link-with-bson-mac
distros:
- macos-1014
- macos-1100
- name: link-with-bson-mingw
distros:
- windows-vsCurrent-large
Expand All @@ -14058,24 +14058,6 @@ buildvariants:
- install-libmongoc-after-libbson
tags:
- pr-merge-gate
- name: clang34ubuntu
display_name: clang 3.4 (Ubuntu 14.04)
expansions:
CC: clang
run_on: ubuntu1404-build
tasks:
- release-compile
- debug-compile-rdtscp
- name: clang35
display_name: clang 3.5 (Debian 8.1)
expansions:
CC: clang
run_on: debian81-test
tasks:
- release-compile
- debug-compile-sasl-openssl
- debug-compile-nosasl-openssl
- .authentication-tests .openssl
- name: clang38
display_name: clang 3.8 (Debian 9.2)
expansions:
Expand Down Expand Up @@ -14139,13 +14121,6 @@ buildvariants:
- debug-compile-nosasl-openssl
- debug-compile-no-align
- .authentication-tests .openssl
- name: gcc48ubuntu
display_name: GCC 4.8 (Ubuntu 14.04)
expansions:
CC: gcc
run_on: ubuntu1404-build
tasks:
- release-compile
- name: gcc82rhel
display_name: GCC 8.2 (RHEL 8.0)
expansions:
Expand Down Expand Up @@ -14174,16 +14149,6 @@ buildvariants:
- debug-compile-nosasl-openssl
- .authentication-tests .openssl
- .latest .nossl
- name: gcc49
display_name: GCC 4.9 (Debian 8.1)
expansions:
CC: gcc
run_on: debian81-test
tasks:
- release-compile
- debug-compile-sasl-openssl
- debug-compile-nosasl-openssl
- .authentication-tests .openssl
- name: gcc63
display_name: GCC 6.3 (Debian 9.2)
expansions:
Expand Down Expand Up @@ -14266,7 +14231,7 @@ buildvariants:
display_name: '*Darwin, macOS (Apple LLVM)'
expansions:
CC: clang
run_on: macos-1014
run_on: macos-1100
tasks:
- .compression !.snappy
- release-compile
Expand Down Expand Up @@ -14462,14 +14427,14 @@ buildvariants:
- name: debug-compile-nosasl-openssl-static
- name: debug-compile-nosasl-darwinssl
distros:
- macos-1014
- macos-1100
- name: debug-compile-nosasl-winssl
distros:
- windows-vsCurrent-large
- name: .ocsp-openssl
- name: .ocsp-darwinssl
distros:
- macos-1014
- macos-1100
- name: .ocsp-winssl
distros:
- windows-vsCurrent-large
Expand Down
65 changes: 0 additions & 65 deletions .evergreen/generated_configs/tasks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2535,23 +2535,6 @@ tasks:
- func: openssl-static-compile
vars:
CC: gcc
- name: sasl-cyrus-darwinssl-macos-1014-clang-compile
run_on: macos-1014
tags: [sasl-matrix-darwinssl, compile, macos-1014, clang, sasl-cyrus]
commands:
- func: sasl-cyrus-darwinssl-compile
vars:
CC: clang
- func: upload-build
- name: sasl-cyrus-darwinssl-macos-1015-clang-compile
run_on: macos-1015
tags: [sasl-matrix-darwinssl, compile, macos-1015, clang, sasl-cyrus]
disable: true
commands:
- func: sasl-cyrus-darwinssl-compile
vars:
CC: clang
- func: upload-build
- name: sasl-cyrus-darwinssl-macos-1100-arm64-clang-compile
run_on: macos-1100-arm64
tags: [sasl-matrix-darwinssl, compile, macos-1100-arm64, clang, sasl-cyrus]
Expand Down Expand Up @@ -2760,22 +2743,6 @@ tasks:
vars:
CC: gcc
- func: upload-build
- name: sasl-cyrus-openssl-debian81-clang-compile
run_on: debian81-large
tags: [sasl-matrix-openssl, compile, debian81, clang, sasl-cyrus]
commands:
- func: sasl-cyrus-openssl-compile
vars:
CC: clang
- func: upload-build
- name: sasl-cyrus-openssl-debian81-gcc-compile
run_on: debian81-large
tags: [sasl-matrix-openssl, compile, debian81, gcc, sasl-cyrus]
commands:
- func: sasl-cyrus-openssl-compile
vars:
CC: gcc
- func: upload-build
- name: sasl-cyrus-openssl-debian92-clang-compile
run_on: debian92-large
tags: [sasl-matrix-openssl, compile, debian92, clang, sasl-cyrus]
Expand Down Expand Up @@ -3024,22 +2991,6 @@ tasks:
- func: bootstrap-mongo-orchestration
- func: run-simple-http-server
- func: run-tests
- name: sasl-cyrus-openssl-ubuntu1404-clang-compile
run_on: ubuntu1404-large
tags: [sasl-matrix-openssl, compile, ubuntu1404, clang, sasl-cyrus]
commands:
- func: sasl-cyrus-openssl-compile
vars:
CC: clang
- func: upload-build
- name: sasl-cyrus-openssl-ubuntu1404-gcc-compile
run_on: ubuntu1404-large
tags: [sasl-matrix-openssl, compile, ubuntu1404, gcc, sasl-cyrus]
commands:
- func: sasl-cyrus-openssl-compile
vars:
CC: gcc
- func: upload-build
- name: sasl-cyrus-openssl-ubuntu1604-arm64-gcc-compile
run_on: ubuntu1604-arm64-large
tags: [sasl-matrix-openssl, compile, ubuntu1604-arm64, gcc, sasl-cyrus]
Expand Down Expand Up @@ -3680,14 +3631,6 @@ tasks:
- func: bootstrap-mongo-orchestration
- func: run-simple-http-server
- func: run-tests
- name: sasl-off-nossl-macos-1014-clang-compile
run_on: macos-1014
tags: [sasl-matrix-nossl, compile, macos-1014, clang, sasl-off]
commands:
- func: sasl-off-nossl-compile
vars:
CC: clang
- func: upload-build
- name: sasl-off-nossl-ubuntu1604-gcc-compile
run_on: ubuntu1604-large
tags: [sasl-matrix-nossl, compile, ubuntu1604, gcc, sasl-off]
Expand Down Expand Up @@ -4406,14 +4349,6 @@ tasks:
vars:
CC: gcc
C_STD_VERSION: 11
- name: std-c11-debian81-clang-compile
run_on: debian81-large
tags: [std-matrix, debian81, clang, compile, std-c11]
commands:
- func: std-compile
vars:
CC: clang
C_STD_VERSION: 11
- name: std-c11-debian92-clang-compile
run_on: debian92-large
tags: [std-matrix, debian92, clang, compile, std-c11]
Expand Down
Loading