Skip to content

Commit 803d005

Browse files
eramongodberamongodb
authored
CDRIVER-5917 drop tasks on windows-64-vs2015 (#1924)
1 parent ae43242 commit 803d005

File tree

6 files changed

+6
-96
lines changed

6 files changed

+6
-96
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
# pylint: disable=line-too-long
1515
# fmt: off
1616
COMPILE_MATRIX = [
17-
('windows-64-vs2015', 'vs2015x64', None, ['cyrus']),
1817
('windows-vsCurrent', 'vs2017x64', None, ['cyrus']),
1918
]
2019

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

Lines changed: 0 additions & 2 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-
('windows-64-vs2015', 'vs2015x64', None, [ 'cyrus', ]),
19-
('windows-64-vs2015', 'vs2015x86', None, ['off', ]),
2018
('windows-vsCurrent', 'mingw', None, [ 'sspi']),
2119
('windows-vsCurrent', 'vs2017x64', None, ['off', 'cyrus', 'sspi']),
2220
('windows-vsCurrent', 'vs2017x86', None, ['off', 'sspi']),

‎.evergreen/config_generator/etc/distros.py

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ def ls_distro(name, **kwargs):
9494
]
9595

9696
WINDOWS_DISTROS = [
97-
*ls_distro(name='windows-64-vs2015', os='windows', os_type='windows', vs_ver='2015'),
9897
*ls_distro(name='windows-64-vs2017', os='windows', os_type='windows', vs_ver='2017'),
9998
*ls_distro(name='windows-64-vs2019', os='windows', os_type='windows', vs_ver='2019'),
10099

@@ -173,10 +172,6 @@ def make_distro_str(distro_name, compiler, arch) -> str:
173172
# ('windows-64-vs2017', 'vs2017x64', None) -> vs2017-x64
174173
# ('windows-64-vs2017', 'mingw', None) -> vs2017-mingw
175174
distro_str = distro_name[len('windows-64-'):] + {
176-
'vs2013x64': '-x64',
177-
'vs2013x86': '-x86',
178-
'vs2015x64': '-x64',
179-
'vs2015x86': '-x86',
180175
'vs2017x64': '-x64',
181176
'vs2017x86': '-x86',
182177
'vs2019x64': '-x64',
@@ -197,10 +192,6 @@ def make_distro_str(distro_name, compiler, arch) -> str:
197192

198193
def to_cc(compiler):
199194
return {
200-
'vs2013x64': 'Visual Studio 12 2013',
201-
'vs2013x86': 'Visual Studio 12 2013',
202-
'vs2015x64': 'Visual Studio 14 2015',
203-
'vs2015x86': 'Visual Studio 14 2015',
204195
'vs2017x64': 'Visual Studio 15 2017',
205196
'vs2017x86': 'Visual Studio 15 2017',
206197
'vs2019x64': 'Visual Studio 16 2019',
@@ -212,10 +203,6 @@ def to_cc(compiler):
212203

213204
def to_platform(compiler):
214205
return {
215-
'vs2013x64': 'x64',
216-
'vs2013x86': 'Win32',
217-
'vs2015x64': 'x64',
218-
'vs2015x86': 'Win32',
219206
'vs2017x64': 'x64',
220207
'vs2017x86': 'Win32',
221208
'vs2019x64': 'x64',

‎.evergreen/generated_configs/legacy-config.yml

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -16544,41 +16544,21 @@ buildvariants:
1654416544
CC: Visual Studio 15 2017 Win64
1654516545
run_on: windows-vsCurrent-large
1654616546
tasks:
16547+
- release-compile
1654716548
- debug-compile-nosasl-nossl
1654816549
- debug-compile-nosasl-openssl
1654916550
- debug-compile-sspi-winssl
16551+
- debug-compile-nosrv
1655016552
- .latest .nossl
1655116553
- .nosasl .latest .nossl
16554+
- .compression !.snappy !.zstd !.latest
1655216555
- test-dns-winssl
1655316556
- test-dns-auth-winssl
1655416557
- debug-compile-aws
1655516558
- test-aws-openssl-regular-4.4
1655616559
- test-aws-openssl-regular-latest
1655716560
- .authentication-tests .openssl !.sasl
1655816561
- .authentication-tests .winssl
16559-
- name: windows-2015
16560-
display_name: Windows (VS 2015)
16561-
expansions:
16562-
CC: Visual Studio 14 2015 Win64
16563-
run_on: windows-64-vs2015-compile
16564-
tasks:
16565-
- .compression !.snappy !.zstd !.latest
16566-
- release-compile
16567-
- debug-compile-sspi-winssl
16568-
- debug-compile-no-align
16569-
- debug-compile-nosrv
16570-
- .authentication-tests .winssl
16571-
- name: windows-2015-32
16572-
display_name: Windows (i686) (VS 2015)
16573-
expansions:
16574-
CC: Visual Studio 14 2015
16575-
run_on: windows-64-vs2015-compile
16576-
tasks:
16577-
- .compression !.snappy !.zstd !.latest
16578-
- release-compile
16579-
- debug-compile-sspi-winssl
16580-
- debug-compile-no-align
16581-
- .authentication-tests .winssl
1658216562
- name: mingw-windows2016
1658316563
display_name: MinGW-W64 (Windows Server 2016)
1658416564
expansions:

‎.evergreen/generated_configs/tasks.yml

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -2793,16 +2793,6 @@ tasks:
27932793
- func: bootstrap-mongo-orchestration
27942794
- func: run-mock-kms-servers
27952795
- func: run-tests
2796-
- name: cse-sasl-cyrus-winssl-vs2015-x64-compile
2797-
run_on: windows-64-vs2015-large
2798-
tags: [cse-matrix-winssl, compile, windows-64-vs2015, vs2015x64, cse, sasl-cyrus]
2799-
commands:
2800-
- func: find-cmake-latest
2801-
- func: cse-sasl-cyrus-winssl-compile
2802-
vars:
2803-
CMAKE_GENERATOR: Visual Studio 14 2015
2804-
CMAKE_GENERATOR_PLATFORM: x64
2805-
- func: upload-build
28062796
- name: cse-sasl-cyrus-winssl-windows-2019-vs2017-x64-compile
28072797
run_on: windows-vsCurrent-large
28082798
tags: [cse-matrix-winssl, compile, windows-vsCurrent, vs2017x64, cse, sasl-cyrus]
@@ -4416,16 +4406,6 @@ tasks:
44164406
- func: bootstrap-mongo-orchestration
44174407
- func: run-simple-http-server
44184408
- func: run-tests
4419-
- name: sasl-cyrus-winssl-vs2015-x64-compile
4420-
run_on: windows-64-vs2015-large
4421-
tags: [sasl-matrix-winssl, compile, windows-64-vs2015, vs2015x64, sasl-cyrus]
4422-
commands:
4423-
- func: find-cmake-latest
4424-
- func: sasl-cyrus-winssl-compile
4425-
vars:
4426-
CMAKE_GENERATOR: Visual Studio 14 2015
4427-
CMAKE_GENERATOR_PLATFORM: x64
4428-
- func: upload-build
44294409
- name: sasl-cyrus-winssl-windows-2019-vs2017-x64-compile
44304410
run_on: windows-vsCurrent-large
44314411
tags: [sasl-matrix-winssl, compile, windows-vsCurrent, vs2017x64, sasl-cyrus]
@@ -5075,16 +5055,6 @@ tasks:
50755055
CMAKE_GENERATOR: Visual Studio 15 2017
50765056
CMAKE_GENERATOR_PLATFORM: x64
50775057
- func: upload-build
5078-
- name: sasl-off-winssl-vs2015-x86-compile
5079-
run_on: windows-64-vs2015-large
5080-
tags: [sasl-matrix-winssl, compile, windows-64-vs2015, vs2015x86, sasl-off]
5081-
commands:
5082-
- func: find-cmake-latest
5083-
- func: sasl-off-winssl-compile
5084-
vars:
5085-
CMAKE_GENERATOR: Visual Studio 14 2015
5086-
CMAKE_GENERATOR_PLATFORM: Win32
5087-
- func: upload-build
50885058
- name: sasl-off-winssl-windows-2019-vs2017-x64-compile
50895059
run_on: windows-vsCurrent-large
50905060
tags: [sasl-matrix-winssl, compile, windows-vsCurrent, vs2017x64, sasl-off]

‎.evergreen/legacy_config_generator/evergreen_config_lib/variants.py

Lines changed: 3 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -226,11 +226,14 @@ def days(n: int) -> int:
226226
"Windows (VS 2017)",
227227
"windows-vsCurrent-large",
228228
[
229+
"release-compile",
229230
"debug-compile-nosasl-nossl",
230231
"debug-compile-nosasl-openssl",
231232
"debug-compile-sspi-winssl",
233+
"debug-compile-nosrv",
232234
".latest .nossl",
233235
".nosasl .latest .nossl",
236+
".compression !.snappy !.zstd !.latest",
234237
"test-dns-winssl",
235238
"test-dns-auth-winssl",
236239
"debug-compile-aws",
@@ -243,33 +246,6 @@ def days(n: int) -> int:
243246
],
244247
{"CC": "Visual Studio 15 2017 Win64"},
245248
),
246-
Variant(
247-
"windows-2015",
248-
"Windows (VS 2015)",
249-
"windows-64-vs2015-compile",
250-
[
251-
".compression !.snappy !.zstd !.latest",
252-
"release-compile",
253-
"debug-compile-sspi-winssl",
254-
"debug-compile-no-align",
255-
"debug-compile-nosrv",
256-
".authentication-tests .winssl",
257-
],
258-
{"CC": "Visual Studio 14 2015 Win64"},
259-
),
260-
Variant(
261-
"windows-2015-32",
262-
"Windows (i686) (VS 2015)",
263-
"windows-64-vs2015-compile",
264-
[
265-
".compression !.snappy !.zstd !.latest",
266-
"release-compile",
267-
"debug-compile-sspi-winssl",
268-
"debug-compile-no-align",
269-
".authentication-tests .winssl",
270-
],
271-
{"CC": "Visual Studio 14 2015"},
272-
),
273249
Variant(
274250
"mingw-windows2016",
275251
"MinGW-W64 (Windows Server 2016)",

0 commit comments

Comments
 (0)