Skip to content

Commit 65d0d38

Browse files
sanych-sunsanych-sun
committed
pr
1 parent f585a45 commit 65d0d38

13 files changed

+16
-53
lines changed

‎evergreen/evergreen.yml‎

Lines changed: 1 addition & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -223,16 +223,6 @@ functions:
223223
params:
224224
file: mo-expansion.yml
225225

226-
compile-sources:
227-
- command: shell.exec
228-
type: system
229-
params:
230-
working_dir: "mongo-csharp-driver"
231-
shell: "bash"
232-
script: |
233-
${PREPARE_SHELL}
234-
bash ./evergreen/compile-sources.sh
235-
236226
download-and-promote-augmented-sbom-to-s3-bucket:
237227
- command: ec2.assume_role
238228
params:
@@ -591,6 +581,7 @@ functions:
591581
echo "This platform does not support the ECS auth test, skipping..."
592582
exit 0
593583
fi
584+
. ./evergreen/compile-sources.sh
594585
echo "Project Directory: $PROJECT_DIRECTORY"
595586
# SRC_DIRECTORY is workaround since EG_TOOLS expects "src" folder as a root
596587
SRC_DIRECTORY=$(dirname $PROJECT_DIRECTORY)/src
@@ -1128,23 +1119,20 @@ tasks:
11281119
- func: configure-framework
11291120
vars:
11301121
FRAMEWORK: net472
1131-
- func: compile-sources
11321122
- func: run-unit-tests
11331123

11341124
- name: unit-tests-netstandard21
11351125
commands:
11361126
- func: configure-framework
11371127
vars:
11381128
FRAMEWORK: netstandard2.1
1139-
- func: compile-sources
11401129
- func: run-unit-tests
11411130

11421131
- name: unit-tests-net60
11431132
commands:
11441133
- func: configure-framework
11451134
vars:
11461135
FRAMEWORK: net6.0
1147-
- func: compile-sources
11481136
- func: run-unit-tests
11491137

11501138
- name: test-net472
@@ -1154,7 +1142,6 @@ tasks:
11541142
- func: configure-framework
11551143
vars:
11561144
FRAMEWORK: net472
1157-
- func: compile-sources
11581145
- func: run-tests
11591146

11601147
- name: test-netstandard21
@@ -1164,7 +1151,6 @@ tasks:
11641151
- func: configure-framework
11651152
vars:
11661153
FRAMEWORK: netstandard2.1
1167-
- func: compile-sources
11681154
- func: run-tests
11691155

11701156
- name: test-net60
@@ -1174,7 +1160,6 @@ tasks:
11741160
- func: configure-framework
11751161
vars:
11761162
FRAMEWORK: net6.0
1177-
- func: compile-sources
11781163
- func: run-tests
11791164

11801165
- name: test-csfle-with-mongocryptd-net472
@@ -1184,7 +1169,6 @@ tasks:
11841169
- func: configure-framework
11851170
vars:
11861171
FRAMEWORK: net472
1187-
- func: compile-sources
11881172
- func: run-csfle-with-mongocryptd-tests
11891173

11901174
- name: test-csfle-with-mongocryptd-netstandard21
@@ -1194,7 +1178,6 @@ tasks:
11941178
- func: configure-framework
11951179
vars:
11961180
FRAMEWORK: netstandard2.1
1197-
- func: compile-sources
11981181
- func: run-csfle-with-mongocryptd-tests
11991182

12001183
- name: test-csfle-with-mongocryptd-net60
@@ -1204,7 +1187,6 @@ tasks:
12041187
- func: configure-framework
12051188
vars:
12061189
FRAMEWORK: net6.0
1207-
- func: compile-sources
12081190
- func: run-csfle-with-mongocryptd-tests
12091191

12101192
- name: test-csfle-with-mocked-kms-tls-net472
@@ -1215,7 +1197,6 @@ tasks:
12151197
- func: configure-framework
12161198
vars:
12171199
FRAMEWORK: net472
1218-
- func: compile-sources
12191200
- func: run-csfle-with-mocked-kms-tests
12201201

12211202
- name: test-csfle-with-mocked-kms-tls-netstandard21
@@ -1226,7 +1207,6 @@ tasks:
12261207
- func: configure-framework
12271208
vars:
12281209
FRAMEWORK: netstandard2.1
1229-
- func: compile-sources
12301210
- func: run-csfle-with-mocked-kms-tests
12311211

12321212
- name: test-csfle-with-mocked-kms-tls-net60
@@ -1237,7 +1217,6 @@ tasks:
12371217
- func: configure-framework
12381218
vars:
12391219
FRAMEWORK: net6.0
1240-
- func: compile-sources
12411220
- func: run-csfle-with-mocked-kms-tests
12421221

12431222
- name: test-load-balancer-netstandard21
@@ -1249,7 +1228,6 @@ tasks:
12491228
- func: configure-framework
12501229
vars:
12511230
FRAMEWORK: netstandard2.1
1252-
- func: compile-sources
12531231
- func: run-load-balancer-tests
12541232
- func: stop-load-balancer
12551233

@@ -1262,7 +1240,6 @@ tasks:
12621240
- func: configure-framework
12631241
vars:
12641242
FRAMEWORK: net6.0
1265-
- func: compile-sources
12661243
- func: run-load-balancer-tests
12671244
- func: stop-load-balancer
12681245

@@ -1272,31 +1249,27 @@ tasks:
12721249
- func: configure-framework
12731250
vars:
12741251
FRAMEWORK: net6.0
1275-
- func: compile-sources
12761252
- func: run-atlas-connectivity-tests
12771253

12781254
- name: test-gssapi-net472
12791255
commands:
12801256
- func: configure-framework
12811257
vars:
12821258
FRAMEWORK: net472
1283-
- func: compile-sources
12841259
- func: run-gssapi-auth-tests
12851260

12861261
- name: test-gssapi-netstandard21
12871262
commands:
12881263
- func: configure-framework
12891264
vars:
12901265
FRAMEWORK: netstandard2.1
1291-
- func: compile-sources
12921266
- func: run-gssapi-auth-tests
12931267

12941268
- name: test-gssapi-net60
12951269
commands:
12961270
- func: configure-framework
12971271
vars:
12981272
FRAMEWORK: net6.0
1299-
- func: compile-sources
13001273
- func: run-gssapi-auth-tests
13011274

13021275
- name: test-socks5-proxy-net472
@@ -1306,7 +1279,6 @@ tasks:
13061279
- func: configure-framework
13071280
vars:
13081281
FRAMEWORK: net472
1309-
- func: compile-sources
13101282
- func: run-socks5-proxy-tests
13111283

13121284
- name: test-socks5-proxy-netstandard21
@@ -1316,7 +1288,6 @@ tasks:
13161288
- func: configure-framework
13171289
vars:
13181290
FRAMEWORK: netstandard21
1319-
- func: compile-sources
13201291
- func: run-socks5-proxy-tests
13211292

13221293
- name: test-socks5-proxy-net60
@@ -1326,15 +1297,13 @@ tasks:
13261297
- func: configure-framework
13271298
vars:
13281299
FRAMEWORK: net60
1329-
- func: compile-sources
13301300
- func: run-socks5-proxy-tests
13311301

13321302
- name: plain-auth-tests
13331303
commands:
13341304
- func: configure-framework
13351305
vars:
13361306
FRAMEWORK: net6.0
1337-
- func: compile-sources
13381307
- func: run-plain-auth-tests
13391308

13401309
- name: aws-auth-tests
@@ -1348,7 +1317,6 @@ tasks:
13481317
- func: configure-framework
13491318
vars:
13501319
FRAMEWORK: net6.0
1351-
- func: compile-sources
13521320
# This step also creates test related users, so don't avoid this step in order to run other tests
13531321
- func: run-aws-auth-test-with-regular-aws-credentials
13541322
- func: run-aws-auth-test-with-assume-role-credentials
@@ -1368,7 +1336,6 @@ tasks:
13681336
- func: configure-framework
13691337
vars:
13701338
FRAMEWORK: net472
1371-
- func: compile-sources
13721339
- func: run-tests
13731340
vars:
13741341
REQUIRE_API_VERSION: true
@@ -1382,7 +1349,6 @@ tasks:
13821349
- func: configure-framework
13831350
vars:
13841351
FRAMEWORK: netstandard2.1
1385-
- func: compile-sources
13861352
- func: run-tests
13871353
vars:
13881354
REQUIRE_API_VERSION: true
@@ -1396,7 +1362,6 @@ tasks:
13961362
- func: configure-framework
13971363
vars:
13981364
FRAMEWORK: net6.0
1399-
- func: compile-sources
14001365
- func: run-tests
14011366
vars:
14021367
REQUIRE_API_VERSION: true
@@ -1407,23 +1372,20 @@ tasks:
14071372
- func: configure-framework
14081373
vars:
14091374
FRAMEWORK: net6.0
1410-
- func: compile-sources
14111375
- func: run-atlas-search-test
14121376

14131377
- name: atlas-search-index-helpers-test
14141378
commands:
14151379
- func: configure-framework
14161380
vars:
14171381
FRAMEWORK: net6.0
1418-
- func: compile-sources
14191382
- func: run-atlas-search-index-helpers-test
14201383

14211384
- name: test-oidc-auth
14221385
commands:
14231386
- func: configure-framework
14241387
vars:
14251388
FRAMEWORK: net6.0
1426-
- func: compile-sources
14271389
- func: run-mongodb-oidc-tests
14281390

14291391
- name: test-oidc-azure
@@ -1497,7 +1459,6 @@ tasks:
14971459
- func: configure-framework
14981460
vars:
14991461
FRAMEWORK: net6.0
1500-
- func: compile-sources
15011462
- func: run-ocsp-test
15021463
vars:
15031464
OCSP_ALGORITHM: "rsa"
@@ -1516,7 +1477,6 @@ tasks:
15161477
- func: configure-framework
15171478
vars:
15181479
FRAMEWORK: net6.0
1519-
- func: compile-sources
15201480
- func: run-ocsp-test
15211481
vars:
15221482
OCSP_ALGORITHM: "rsa"
@@ -1535,7 +1495,6 @@ tasks:
15351495
- func: configure-framework
15361496
vars:
15371497
FRAMEWORK: net6.0
1538-
- func: compile-sources
15391498
- func: run-ocsp-test
15401499
vars:
15411500
OCSP_ALGORITHM: "rsa"
@@ -1554,7 +1513,6 @@ tasks:
15541513
- func: configure-framework
15551514
vars:
15561515
FRAMEWORK: net6.0
1557-
- func: compile-sources
15581516
- func: run-ocsp-test
15591517
vars:
15601518
OCSP_ALGORITHM: "rsa"
@@ -1569,7 +1527,6 @@ tasks:
15691527
- func: configure-framework
15701528
vars:
15711529
FRAMEWORK: net6.0
1572-
- func: compile-sources
15731530
- func: run-ocsp-test
15741531
vars:
15751532
OCSP_ALGORITHM: "rsa"
@@ -1588,7 +1545,6 @@ tasks:
15881545
- func: configure-framework
15891546
vars:
15901547
FRAMEWORK: net6.0
1591-
- func: compile-sources
15921548
- func: run-ocsp-test
15931549
vars:
15941550
OCSP_ALGORITHM: "rsa"
@@ -1603,7 +1559,6 @@ tasks:
16031559
- func: configure-framework
16041560
vars:
16051561
FRAMEWORK: net6.0
1606-
- func: compile-sources
16071562
- func: run-ocsp-test
16081563
vars:
16091564
OCSP_ALGORITHM: "rsa"
@@ -1622,7 +1577,6 @@ tasks:
16221577
- func: configure-framework
16231578
vars:
16241579
FRAMEWORK: net6.0
1625-
- func: compile-sources
16261580
- func: run-ocsp-test
16271581
vars:
16281582
OCSP_ALGORITHM: "rsa"
@@ -1641,7 +1595,6 @@ tasks:
16411595
- func: configure-framework
16421596
vars:
16431597
FRAMEWORK: net6.0
1644-
- func: compile-sources
16451598
- func: run-ocsp-test
16461599
vars:
16471600
OCSP_ALGORITHM: "rsa"
@@ -1660,7 +1613,6 @@ tasks:
16601613
- func: configure-framework
16611614
vars:
16621615
FRAMEWORK: net6.0
1663-
- func: compile-sources
16641616
- func: run-ocsp-test
16651617
vars:
16661618
OCSP_ALGORITHM: "rsa"
@@ -1679,7 +1631,6 @@ tasks:
16791631
- func: configure-framework
16801632
vars:
16811633
FRAMEWORK: net6.0
1682-
- func: compile-sources
16831634
- func: run-ocsp-test
16841635
vars:
16851636
OCSP_ALGORITHM: "rsa"
@@ -1698,7 +1649,6 @@ tasks:
16981649
- func: configure-framework
16991650
vars:
17001651
FRAMEWORK: net6.0
1701-
- func: compile-sources
17021652
- func: run-ocsp-test
17031653
vars:
17041654
OCSP_ALGORITHM: "rsa"

‎evergreen/run-atlas-connectivity-tests.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,5 @@ set -o errexit # Exit the script with error if any of the commands fail
88

99
# Provision the correct connection string and set up SSL if needed
1010
for var in TMP TEMP NUGET_PACKAGES NUGET_HTTP_CACHE_PATH APPDATA; do setx $var z:\\data\\tmp; export $var=z:\\data\\tmp; done
11+
. ./evergreen/compile-sources.sh
1112
powershell.exe .\\build.ps1 --target TestAtlasConnectivity

‎evergreen/run-atlas-search-index-helpers-test.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,5 @@ echo "Running Atlas Search Index Helpers driver tests"
1313

1414
export ATLAS_SEARCH_INDEX_HELPERS_TESTS_ENABLED=true
1515

16-
./build.sh --target=TestAtlasSearchIndexHelpers
16+
. ./evergreen/compile-sources.sh
17+
./build.sh --target=TestAtlasSearchIndexHelpers

‎evergreen/run-atlas-search-test.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,5 @@ echo "Running Atlas Search driver tests"
1313

1414
export ATLAS_SEARCH_TESTS_ENABLED=true
1515

16-
powershell.exe .\\build.ps1 --target=TestAtlasSearch
16+
. ./evergreen/compile-sources.sh
17+
powershell.exe .\\build.ps1 --target=TestAtlasSearch

‎evergreen/run-csfle-azure-tests.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,5 @@ export CSFLE_AZURE_KMS_TESTS_ENABLED=true
2424
export FRAMEWORK=net6.0
2525
. ./evergreen/install-dotnet.sh
2626

27+
. ./evergreen/compile-sources.sh
2728
. ./build.sh --target=TestCsfleWithAzureKms

‎evergreen/run-csfle-gcp-tests.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,5 @@ export CSFLE_GCP_KMS_TESTS_ENABLED=true
1717
export FRAMEWORK=net6.0
1818
. ./evergreen/install-dotnet.sh
1919

20+
. ./evergreen/compile-sources.sh
2021
. ./build.sh --target=TestCsfleWithGcpKms

0 commit comments

Comments
 (0)