Skip to content

Commit 6ce1f86

Browse files
committed
Standardize binary to bash
1 parent c017581 commit 6ce1f86

File tree

1 file changed

+20
-16
lines changed

1 file changed

+20
-16
lines changed

.evergreen/config.yml

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ functions:
8383
- command: subprocess.exec
8484
params:
8585
binary: bash
86-
silent: true
8786
working_dir: "src"
8887
include_expansions_in_env: ["AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN"]
8988
args:
@@ -261,7 +260,7 @@ functions:
261260
- command: subprocess.exec
262261
type: test
263262
params:
264-
include_expansions_in_env: ["PROJECT_DIRECTORY", "PYTHON_BINARY", "MOD_WSGI_VERSION", "MOD_WSGI_EMBEDDED"]
263+
include_expansions_in_env: ["PYTHON_BINARY", "MOD_WSGI_VERSION", "MOD_WSGI_EMBEDDED"]
265264
working_dir: "src"
266265
binary: bash
267266
args:
@@ -366,7 +365,7 @@ functions:
366365
params:
367366
binary: bash
368367
working_dir: "src"
369-
include_expansions_in_env: ["DRIVERS_TOOLS", "PROJECT_DIRECTORY", "AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN"]
368+
include_expansions_in_env: ["AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN"]
370369
args:
371370
- .evergreen/scripts/run-enterprise-auth-tests.sh
372371

@@ -375,7 +374,7 @@ functions:
375374
type: test
376375
params:
377376
binary: bash
378-
include_expansions_in_env: ["DRIVERS_TOOLS", "PROJECT_DIRECTORY", "PYTHON_BINARY", "AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN"]
377+
include_expansions_in_env: ["PYTHON_BINARY", "AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN"]
379378
working_dir: "src"
380379
args:
381380
- .evergreen/scripts/run-atlas-tests.sh
@@ -393,7 +392,7 @@ functions:
393392
- command: subprocess.exec
394393
type: test
395394
params:
396-
include_expansions_in_env: ["DRIVERS_TOOLS"]
395+
include_expansions_in_env: ["DRIVERS_TOOLS", "PYTHON_BINARY", "skip_EC2_auth_test"]
397396
binary: bash
398397
working_dir: "src"
399398
args:
@@ -404,7 +403,7 @@ functions:
404403
- command: subprocess.exec
405404
type: test
406405
params:
407-
include_expansions_in_env: ["DRIVERS_TOOLS"]
406+
include_expansions_in_env: ["DRIVERS_TOOLS", "skip_EC2_auth_test"]
408407
binary: bash
409408
working_dir: "src"
410409
args:
@@ -414,7 +413,7 @@ functions:
414413
- command: subprocess.exec
415414
type: test
416415
params:
417-
include_expansions_in_env: ["DRIVERS_TOOLS"]
416+
include_expansions_in_env: ["DRIVERS_TOOLS", "skip_EC2_auth_test"]
418417
binary: bash
419418
working_dir: "src"
420419
args:
@@ -424,7 +423,7 @@ functions:
424423
- command: subprocess.exec
425424
type: test
426425
params:
427-
include_expansions_in_env: ["DRIVERS_TOOLS"]
426+
include_expansions_in_env: ["DRIVERS_TOOLS", "skip_EC2_auth_test"]
428427
binary: bash
429428
working_dir: "src"
430429
args:
@@ -436,7 +435,7 @@ functions:
436435
- command: subprocess.exec
437436
type: test
438437
params:
439-
include_expansions_in_env: ["DRIVERS_TOOLS"]
438+
include_expansions_in_env: ["DRIVERS_TOOLS", "skip_EC2_auth_test"]
440439
binary: bash
441440
working_dir: "src"
442441
args:
@@ -446,7 +445,7 @@ functions:
446445
- command: subprocess.exec
447446
type: test
448447
params:
449-
include_expansions_in_env: ["DRIVERS_TOOLS"]
448+
include_expansions_in_env: ["DRIVERS_TOOLS", "skip_EC2_auth_test"]
450449
binary: bash
451450
working_dir: "src"
452451
args:
@@ -478,7 +477,7 @@ functions:
478477
- command: subprocess.exec
479478
type: test
480479
params:
481-
binary: "bash"
480+
binary: bash
482481
working_dir: "src"
483482
args:
484483
- .evergreen/scripts/run-aws-ecs-auth-test.sh
@@ -498,30 +497,35 @@ functions:
498497
"fix absolute paths":
499498
- command: subprocess.exec
500499
params:
500+
binary: bash
501501
args:
502502
- src/.evergreen/scripts/fix-absolute-paths.sh
503503

504504
"windows fix":
505505
- command: subprocess.exec
506506
params:
507+
binary: bash
507508
args:
508509
- src/.evergreen/scripts/windows-fix.sh
509510

510511
"make files executable":
511512
- command: subprocess.exec
512513
params:
514+
binary: bash
513515
args:
514516
- src/.evergreen/scripts/make-files-executable.sh
515517

516518
"init test-results":
517519
- command: subprocess.exec
518520
params:
521+
binary: bash
519522
args:
520523
- src/.evergreen/scripts/init-test-results.sh
521524

522525
"install dependencies":
523526
- command: subprocess.exec
524527
params:
528+
binary: bash
525529
working_dir: "src"
526530
args:
527531
- .evergreen/scripts/install-dependencies.sh
@@ -549,7 +553,7 @@ functions:
549553
- command: subprocess.exec
550554
type: test
551555
params:
552-
include_expansions_in_env: ["DRIVERS_TOOLS", "PROJECT_DIRECTORY", "OCSP_ALGORITHM", "OCSP_TLS_SHOULD_SUCCEED"]
556+
include_expansions_in_env: ["OCSP_ALGORITHM", "OCSP_TLS_SHOULD_SUCCEED"]
553557
binary: bash
554558
working_dir: "src"
555559
args:
@@ -560,7 +564,7 @@ functions:
560564
params:
561565
background: true
562566
binary: bash
563-
include_expansions_in_env: [SERVER_TYPE, OCSP_ALGORITHM]
567+
include_expansions_in_env: ["SERVER_TYPE", "OCSP_ALGORITHM"]
564568
args:
565569
- ${DRIVERS_TOOLS}/.evergreen/ocsp/setup.sh
566570

@@ -683,13 +687,13 @@ task_groups:
683687
- func: make files executable
684688
- command: subprocess.exec
685689
params:
686-
binary: "bash"
690+
binary: bash
687691
args:
688692
- ${DRIVERS_TOOLS}/.evergreen/csfle/gcpkms/create-and-setup-instance.sh
689693
teardown_task:
690694
- command: subprocess.exec
691695
params:
692-
binary: "bash"
696+
binary: bash
693697
args:
694698
- ${DRIVERS_TOOLS}/.evergreen/csfle/gcpkms/delete-instance.sh
695699
- func: "upload test results"
@@ -1535,7 +1539,7 @@ tasks:
15351539
type: setup
15361540
params:
15371541
working_dir: "src"
1538-
binary: "bash"
1542+
binary: bash
15391543
include_expansions_in_env: ["DRIVERS_TOOLS"]
15401544
args:
15411545
- .evergreen/run-gcpkms-test.sh

0 commit comments

Comments
 (0)