@@ -292,16 +292,38 @@ buildvariants:
292
292
tasks :
293
293
- serverless-task-group
294
294
295
- - name : oidc
296
- display_name : OIDC
297
- patchable : false
295
+ - name : oidc-linux
296
+ display_name : " OIDC Linux "
297
+ patchable : true
298
298
run_on :
299
- - ubuntu2204-small
299
+ - ubuntu2204-large
300
+ expansions :
301
+ AUTH : auth
302
+ SSL : ssl
303
+ tasks :
304
+ - testoidc_task_group
305
+
306
+ - name : oidc-macos
307
+ display_name : " OIDC Macos"
308
+ patchable : true
309
+ run_on :
310
+ - macos-1100
300
311
expansions :
301
312
AUTH : auth
302
313
SSL : ssl
303
314
tasks :
304
- - test-oidc
315
+ - testoidc_task_group
316
+
317
+ - name : oidc-windows
318
+ display_name : " OIDC Windows"
319
+ patchable : true
320
+ run_on :
321
+ - windows-64-vsMulti-small
322
+ expansions :
323
+ AUTH : auth
324
+ SSL : ssl
325
+ tasks :
326
+ - testoidc_task_group
305
327
306
328
- name : in-use-encryption
307
329
display_name : " In-Use Encryption"
@@ -588,6 +610,35 @@ task_groups:
588
610
tasks :
589
611
- test-aws-lambda-deployed
590
612
613
+ - name : testoidc_task_group
614
+ setup_group :
615
+ - func : fetch source
616
+ - func : create expansions
617
+ - func : prepare resources
618
+ - func : fix absolute paths
619
+ - func : init test-results
620
+ - func : make files executable
621
+ - func : assume ec2 role
622
+ - func : install rust
623
+ - func : install junit dependencies
624
+ - command : shell.exec
625
+ params :
626
+ shell : bash
627
+ include_expansions_in_env : ["AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN"]
628
+ script : |
629
+ ${PREPARE_SHELL}
630
+ ${DRIVERS_TOOLS}/.evergreen/auth_oidc/setup.sh
631
+ teardown_task :
632
+ - command : subprocess.exec
633
+ params :
634
+ binary : bash
635
+ args :
636
+ - ${DRIVERS_TOOLS}/.evergreen/auth_oidc/teardown.sh
637
+ setup_group_can_fail_task : true
638
+ setup_group_timeout_secs : 1800
639
+ tasks :
640
+ - oidc-auth-test-latest
641
+
591
642
# ########
592
643
# Tasks #
593
644
# ########
@@ -1052,18 +1103,6 @@ tasks:
1052
1103
TOPOLOGY : replica_set
1053
1104
- func : " run sync tests"
1054
1105
1055
- - name : test-oidc
1056
- commands :
1057
- - func : bootstrap oidc
1058
- - func : bootstrap mongo-orchestration
1059
- vars :
1060
- AUTH : auth
1061
- ORCHESTRATION_FILE : auth-oidc.json
1062
- MONGODB_VERSION : latest
1063
- TOPOLOGY : replica_set
1064
- - func : setup oidc
1065
- - func : run oidc tests
1066
-
1067
1106
- name : test-in-use-encryption-4.2
1068
1107
tags : [in-use-encryption]
1069
1108
commands :
@@ -1219,7 +1258,7 @@ tasks:
1219
1258
LOAD_BALANCER : true
1220
1259
- func : start load balancer
1221
1260
- func : run driver test suite
1222
-
1261
+
1223
1262
- name : test-aws-lambda-deployed
1224
1263
commands :
1225
1264
- command : ec2.assume_role
@@ -1238,6 +1277,10 @@ tasks:
1238
1277
AWS_REGION : us-east-1
1239
1278
SAM_BUILD_ARGS : --beta-features --debug
1240
1279
1280
+ - name : " oidc-auth-test-latest"
1281
+ commands :
1282
+ - func : " run oidc auth test with test credentials"
1283
+
1241
1284
# ############
1242
1285
# Functions #
1243
1286
# ############
@@ -1678,45 +1721,21 @@ functions:
1678
1721
./test-contents/test-exe on_demand_gcp_credentials --nocapture"
1679
1722
$DRIVERS_TOOLS/.evergreen/csfle/gcpkms/run-command.sh
1680
1723
1681
- " bootstrap oidc " :
1724
+ " assume ec2 role " :
1682
1725
- command : ec2.assume_role
1683
1726
params :
1684
1727
role_arn : ${aws_test_secrets_role}
1685
- - command : shell.exec
1686
- params :
1687
- working_dir : src
1688
- shell : bash
1689
- script : |
1690
- ${PREPARE_SHELL}
1691
- cd ${DRIVERS_TOOLS}/.evergreen/auth_oidc
1692
- set +o xtrace
1693
-
1694
- export OIDC_TOKEN_DIR=/tmp/tokens
1695
-
1696
- . ./activate-authoidcvenv.sh
1697
- python oidc_write_orchestration.py
1698
- python oidc_get_tokens.py
1699
-
1700
- " setup oidc " :
1701
- - command : shell.exec
1702
- params :
1703
- working_dir : src
1704
- shell : bash
1705
- script : |
1706
- ${PREPARE_SHELL}
1707
- cd ${DRIVERS_TOOLS}/.evergreen/auth_oidc
1708
- mongosh setup_oidc.js
1709
1728
1710
- " run oidc tests " :
1729
+ " run oidc auth test with test credentials " :
1711
1730
- command : shell.exec
1712
1731
type : test
1713
1732
params :
1714
1733
working_dir : src
1715
1734
shell : bash
1735
+ include_expansions_in_env : ["DRIVERS_TOOLS", "AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN"]
1716
1736
script : |
1717
1737
${PREPARE_SHELL}
1718
- export OIDC_TOKEN_DIR=/tmp/tokens
1719
- .evergreen/run-oidc-tests.sh
1738
+ .evergreen/run-mongodb-oidc-test.sh
1720
1739
1721
1740
" compile only " :
1722
1741
- command : shell.exec
0 commit comments