Skip to content

Commit 40e27f9

Browse files
authored
Switch smoke tests to spec matrix (#1462)
1 parent 711fdf6 commit 40e27f9

File tree

1 file changed

+41
-61
lines changed

1 file changed

+41
-61
lines changed

evergreen/evergreen.yml

Lines changed: 41 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1539,40 +1539,10 @@ tasks:
15391539
OCSP_ALGORITHM: "rsa"
15401540
OCSP_TLS_SHOULD_SUCCEED: "false"
15411541

1542-
- name: test-smoke-tests-net472
1542+
- name: test-smoke-tests
15431543
commands:
15441544
- func: bootstrap-mongo-orchestration
15451545
- func: run-smoke-tests
1546-
vars:
1547-
FRAMEWORK: net472
1548-
1549-
- name: test-smoke-tests-netcoreapp31
1550-
commands:
1551-
- func: bootstrap-mongo-orchestration
1552-
- func: run-smoke-tests
1553-
vars:
1554-
FRAMEWORK: netcoreapp31
1555-
1556-
- name: test-smoke-tests-net50
1557-
commands:
1558-
- func: bootstrap-mongo-orchestration
1559-
- func: run-smoke-tests
1560-
vars:
1561-
FRAMEWORK: net50
1562-
1563-
- name: test-smoke-tests-net60
1564-
commands:
1565-
- func: bootstrap-mongo-orchestration
1566-
- func: run-smoke-tests
1567-
vars:
1568-
FRAMEWORK: net60
1569-
1570-
- name: test-smoke-tests-net80
1571-
commands:
1572-
- func: bootstrap-mongo-orchestration
1573-
- func: run-smoke-tests
1574-
vars:
1575-
FRAMEWORK: net80
15761546

15771547
- name: performance-tests-net80-server-v6.0
15781548
commands:
@@ -2085,6 +2055,25 @@ axes:
20852055
variables:
20862056
FRAMEWORK: net60
20872057

2058+
- id: runtime_framework
2059+
display_name: Runtime .net
2060+
values:
2061+
- id: "net472"
2062+
variables:
2063+
FRAMEWORK: net472
2064+
- id: "netcoreapp31"
2065+
variables:
2066+
FRAMEWORK: netcoreapp31
2067+
- id: "net50"
2068+
variables:
2069+
FRAMEWORK: net50
2070+
- id: "net60"
2071+
variables:
2072+
FRAMEWORK: net60
2073+
- id: "net80"
2074+
variables:
2075+
FRAMEWORK: net80
2076+
20882077
- id: serverless
20892078
display_name: Serverless
20902079
values:
@@ -2411,7 +2400,7 @@ buildvariants:
24112400
tags: ["tests-variant"]
24122401
tasks:
24132402
- name: test-netstandard21
2414-
- name: test-net60
2403+
- name: test-net60
24152404

24162405
# Unsecure tests
24172406
- matrix_name: "unsecure-tests-windows"
@@ -2421,7 +2410,7 @@ buildvariants:
24212410
tasks:
24222411
- name: test-net472
24232412
- name: test-netstandard21
2424-
- name: test-net60
2413+
- name: test-net60
24252414

24262415
- matrix_name: "unsecure-tests-macOS"
24272416
matrix_spec: { version: ["5.0", "6.0", "7.0", "8.0", "rapid", "latest"], topology: "replicaset", auth: "noauth", ssl: "nossl", os: ["macos-14", "macos-14-arm64"] }
@@ -2686,36 +2675,27 @@ buildvariants:
26862675
- name: test-csfle-with-mongocryptd-net60
26872676

26882677
# Smoke tests
2689-
- matrix_name: "smoke-tests-windows"
2690-
matrix_spec: { os: "windows-64", ssl: "nossl", version: ["5.0", "6.0", "7.0", "8.0", "latest"], topology: ["replicaset"] }
2691-
display_name: "smoke-tests ${version} ${os}"
2692-
batchtime: 1440 # 1 day
2693-
tasks:
2694-
- name: test-smoke-tests-net472
2695-
- name: test-smoke-tests-netcoreapp31
2696-
- name: test-smoke-tests-net50
2697-
- name: test-smoke-tests-net60
2698-
- name: test-smoke-tests-net80
2699-
2700-
- matrix_name: "smoke-tests-linux"
2701-
matrix_spec: { os: "ubuntu-2004", ssl: "nossl", version: ["5.0", "6.0", "7.0", "8.0", "latest"], topology: ["replicaset"] }
2702-
display_name: "smoke-tests ${version} ${os}"
2703-
batchtime: 1440 # 1 day
2704-
tasks:
2705-
- name: test-smoke-tests-netcoreapp31
2706-
- name: test-smoke-tests-net50
2707-
- name: test-smoke-tests-net60
2708-
- name: test-smoke-tests-net80
2709-
2710-
- matrix_name: "smoke-tests-macOS"
2711-
matrix_spec: { os: "macos-14", ssl: "nossl", version: ["5.0", "6.0", "7.0", "8.0", "latest"], topology: ["replicaset"] }
2712-
display_name: "smoke-tests ${version} ${os}"
2678+
- matrix_name: "smoke-tests"
2679+
matrix_spec:
2680+
os: ["ubuntu-2004", "macos-14", "windows-64"]
2681+
ssl: "nossl"
2682+
version: ["5.0", "6.0", "7.0", "8.0", "latest"]
2683+
topology: ["replicaset"]
2684+
runtime_framework: "*"
2685+
exclude_spec:
2686+
# We do not support net472 for non-Windows platforms
2687+
- os: ["ubuntu-2004", "macos-14"]
2688+
ssl: "*"
2689+
version: "*"
2690+
topology: "*"
2691+
runtime_framework: "net472"
2692+
display_name: "smoke-tests ${version} on ${os} ${runtime_framework}"
27132693
batchtime: 1440 # 1 day
27142694
tasks:
2715-
- name: test-smoke-tests-netcoreapp31
2716-
- name: test-smoke-tests-net50
2717-
- name: test-smoke-tests-net60
2718-
- name: test-smoke-tests-net80
2695+
- name: test-smoke-tests
2696+
depends_on:
2697+
- name: push-packages-myget
2698+
variant: ".push-packages-myget"
27192699

27202700
# Package release variants
27212701
- matrix_name: build-packages

0 commit comments

Comments
 (0)