@@ -1539,40 +1539,10 @@ tasks:
1539
1539
OCSP_ALGORITHM : " rsa"
1540
1540
OCSP_TLS_SHOULD_SUCCEED : " false"
1541
1541
1542
- - name : test-smoke-tests-net472
1542
+ - name : test-smoke-tests
1543
1543
commands :
1544
1544
- func : bootstrap-mongo-orchestration
1545
1545
- 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
1576
1546
1577
1547
- name : performance-tests-net80-server-v6.0
1578
1548
commands :
@@ -2085,6 +2055,25 @@ axes:
2085
2055
variables :
2086
2056
FRAMEWORK : net60
2087
2057
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
+
2088
2077
- id : serverless
2089
2078
display_name : Serverless
2090
2079
values :
@@ -2411,7 +2400,7 @@ buildvariants:
2411
2400
tags : ["tests-variant"]
2412
2401
tasks :
2413
2402
- name : test-netstandard21
2414
- - name : test-net60
2403
+ - name : test-net60
2415
2404
2416
2405
# Unsecure tests
2417
2406
- matrix_name : " unsecure-tests-windows"
@@ -2421,7 +2410,7 @@ buildvariants:
2421
2410
tasks :
2422
2411
- name : test-net472
2423
2412
- name : test-netstandard21
2424
- - name : test-net60
2413
+ - name : test-net60
2425
2414
2426
2415
- matrix_name : " unsecure-tests-macOS"
2427
2416
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:
2686
2675
- name : test-csfle-with-mongocryptd-net60
2687
2676
2688
2677
# 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}"
2713
2693
batchtime : 1440 # 1 day
2714
2694
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 "
2719
2699
2720
2700
# Package release variants
2721
2701
- matrix_name : build-packages
0 commit comments