Skip to content

Commit ec3c2c4

Browse files
NoahStappNoahStapp
committed
All but run_tests
1 parent 6ce1f86 commit ec3c2c4

19 files changed

+140
-87
lines changed

‎.evergreen/config.yml

Lines changed: 48 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,9 @@ exec_timeout_secs: 3600 # 60 minutes is the longest we'll ever run (primarily
2020

2121
# What to do when evergreen hits the timeout (`post:` tasks are run automatically)
2222
timeout:
23-
- command: shell.exec
23+
- command: subprocess.exec
2424
params:
25-
script: |
26-
ls -la
25+
binary: ls -la
2726

2827
include:
2928
- filename: .evergreen/generated_configs/tasks.yml
@@ -97,13 +96,17 @@ functions:
9796
args:
9897
- .evergreen/combine-coverage.sh
9998
# Upload the resulting html coverage report.
100-
- command: shell.exec
99+
- command: subprocess.exec
101100
params:
102101
silent: true
102+
binary: bash
103103
working_dir: "src"
104104
include_expansions_in_env: ["AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN"]
105-
script: |
106-
aws s3 cp htmlcov/ s3://${bucket_name}/coverage/${revision}/${version_id}/htmlcov/ --recursive --acl public-read --region us-east-1
105+
args:
106+
- src/.evergreen/scripts/upload-coverage-report.sh
107+
- ${bucket_name}
108+
- ${revision}
109+
- ${version_id}
107110
# Attach the index.html with s3.put so it shows up in the Evergreen UI.
108111
- command: s3.put
109112
params:
@@ -483,16 +486,12 @@ functions:
483486
- .evergreen/scripts/run-aws-ecs-auth-test.sh
484487

485488
"cleanup":
486-
- command: shell.exec
489+
- command: subprocess.exec
487490
params:
491+
binary: bash
488492
working_dir: "src"
489-
script: |
490-
. .evergreen/scripts/env.sh
491-
if [ -f $DRIVERS_TOOLS/.evergreen/csfle/secrets-export.sh ]; then
492-
. .evergreen/hatch.sh encryption:teardown
493-
fi
494-
rm -rf ${DRIVERS_TOOLS} || true
495-
rm -f ./secrets-export.sh || true
493+
args:
494+
- .evergreen/scripts/cleanup.sh
496495

497496
"fix absolute paths":
498497
- command: subprocess.exec
@@ -553,7 +552,7 @@ functions:
553552
- command: subprocess.exec
554553
type: test
555554
params:
556-
include_expansions_in_env: ["OCSP_ALGORITHM", "OCSP_TLS_SHOULD_SUCCEED"]
555+
include_expansions_in_env: ["OCSP_ALGORITHM", "OCSP_TLS_SHOULD_SUCCEED", "PYTHON_BINARY"]
557556
binary: bash
558557
working_dir: "src"
559558
args:
@@ -569,42 +568,36 @@ functions:
569568
- ${DRIVERS_TOOLS}/.evergreen/ocsp/setup.sh
570569

571570
"run load-balancer":
572-
- command: shell.exec
571+
- command: subprocess.exec
573572
params:
574-
script: |
575-
DRIVERS_TOOLS=${DRIVERS_TOOLS} MONGODB_URI=${MONGODB_URI} bash ${DRIVERS_TOOLS}/.evergreen/run-load-balancer.sh start
573+
binary: bash
574+
include_expansions_in_env: ["MONGODB_URI"]
575+
args:
576+
- src/.evergreen/scripts/run-load-balancer.sh
576577
- command: expansions.update
577578
params:
578579
file: lb-expansion.yml
579580

580581
"stop load-balancer":
581-
- command: shell.exec
582+
- command: subprocess.exec
582583
params:
583-
script: |
584-
cd ${DRIVERS_TOOLS}/.evergreen
585-
DRIVERS_TOOLS=${DRIVERS_TOOLS} bash ${DRIVERS_TOOLS}/.evergreen/run-load-balancer.sh stop
584+
binary: bash
585+
args:
586+
- src/.evergreen/scripts/stop-load-balancer.sh
586587

587588
"teardown_docker":
588-
- command: shell.exec
589+
- command: subprocess.exec
589590
params:
590-
script: |
591-
# Remove all Docker images
592-
DOCKER=$(command -v docker) || true
593-
if [ -n "$DOCKER" ]; then
594-
docker rmi -f $(docker images -a -q) &> /dev/null || true
595-
fi
591+
binary: bash
592+
args:
593+
- src/.evergreen/scripts/teardown-docker.sh
596594

597595
"teardown_aws":
598-
- command: shell.exec
596+
- command: subprocess.exec
599597
params:
600-
shell: "bash"
601-
script: |
602-
. src/.evergreen/scripts/env.sh
603-
cd "${DRIVERS_TOOLS}/.evergreen/auth_aws"
604-
if [ -f "./aws_e2e_setup.json" ]; then
605-
. ./activate-authawsvenv.sh
606-
python ./lib/aws_assign_instance_profile.py
607-
fi
598+
binary: bash
599+
args:
600+
- src/.evergreen/scripts/teardown-aws.sh
608601

609602
"teardown atlas":
610603
- command: subprocess.exec
@@ -614,10 +607,13 @@ functions:
614607
- ${DRIVERS_TOOLS}/.evergreen/atlas/teardown-atlas-cluster.sh
615608

616609
"run perf tests":
617-
- command: shell.exec
610+
- command: subprocess.exec
618611
type: test
619612
params:
620613
working_dir: "src"
614+
binary: bash
615+
args:
616+
- .evergreen/scripts/run-perf-tests.sh
621617
script: |
622618
. .evergreen/scripts/env.sh
623619
PROJECT_DIRECTORY=${PROJECT_DIRECTORY} bash ${PROJECT_DIRECTORY}/.evergreen/run-perf-tests.sh
@@ -858,31 +854,12 @@ tasks:
858854
# Throw it here, and execute this task on all buildvariants
859855
- name: getdata
860856
commands:
861-
- command: shell.exec
857+
- command: subprocess.exec
858+
binary: bash
862859
type: test
863860
params:
864-
script: |
865-
set -o xtrace
866-
. ${DRIVERS_TOOLS}/.evergreen/download-mongodb.sh || true
867-
get_distro || true
868-
echo $DISTRO
869-
echo $MARCH
870-
echo $OS
871-
uname -a || true
872-
ls /etc/*release* || true
873-
cc --version || true
874-
gcc --version || true
875-
clang --version || true
876-
gcov --version || true
877-
lcov --version || true
878-
llvm-cov --version || true
879-
echo $PATH
880-
ls -la /usr/local/Cellar/llvm/*/bin/ || true
881-
ls -la /usr/local/Cellar/ || true
882-
scan-build --version || true
883-
genhtml --version || true
884-
valgrind --version || true
885-
861+
args:
862+
- src/.evergreen/scripts/run-getdata.sh
886863
# Standard test tasks {{{
887864

888865
- name: "mockupdb"
@@ -1552,17 +1529,13 @@ tasks:
15521529
vars:
15531530
VERSION: "latest"
15541531
TOPOLOGY: "server"
1555-
- command: shell.exec
1532+
- command: subprocess.exec
15561533
type: test
15571534
params:
15581535
working_dir: "src"
1559-
shell: "bash"
1560-
script: |
1561-
. .evergreen/scripts/env.sh
1562-
export PYTHON_BINARY=/opt/mongodbtoolchain/v4/bin/python3
1563-
export LIBMONGOCRYPT_URL=https://s3.amazonaws.com/mciuploads/libmongocrypt/debian11/master/latest/libmongocrypt.tar.gz
1564-
SKIP_SERVERS=1 bash ./.evergreen/setup-encryption.sh
1565-
SUCCESS=false TEST_FLE_GCP_AUTO=1 ./.evergreen/hatch.sh test:test-eg
1536+
binary: "bash"
1537+
args:
1538+
- .evergreen/scripts/run-gcpkms-fail-test.sh
15661539

15671540
- name: testazurekms-task
15681541
commands:
@@ -1628,18 +1601,15 @@ tasks:
16281601
- name: "check-import-time"
16291602
tags: ["pr"]
16301603
commands:
1631-
- command: shell.exec
1604+
- command: subprocess.exec
16321605
type: test
16331606
params:
16341607
shell: "bash"
16351608
working_dir: src
1636-
script: |
1637-
. .evergreen/scripts/env.sh
1638-
set -x
1639-
export BASE_SHA=${revision}
1640-
export HEAD_SHA=${github_commit}
1641-
bash .evergreen/run-import-time-test.sh
1642-
1609+
args:
1610+
- .evergreen/scripts/check-import-time.sh
1611+
- ${revision}
1612+
- ${github_commit}
16431613
- name: "backport-pr"
16441614
allowed_requesters: ["commit"]
16451615
commands:

‎.evergreen/scripts/archive-mongodb-logs.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#!/bin/bash
22

3-
. .evergreen/scripts/env.sh
3+
. src/.evergreen/scripts/env.sh
44
set -o xtrace
55
mkdir out_dir
6-
find "$MONGO_ORCHESTRATION_HOME" -name \*.log -exec sh -c 'x="{}"; mv $x $PWD/out_dir/$(basename $(dirname $x))_$(basename $x)' \;
6+
find "$MONGO_ORCHESTRATION_HOME" -name \*.log -exec sh -c 'x=$1; mv $x $PWD/out_dir/$(basename $(dirname $x))_$(basename $x)' shell {} \;
77
tar zcvf mongodb-logs.tar.gz -C out_dir/ .
88
rm -rf out_dir

‎.evergreen/scripts/bootstrap-mongo-orchestration.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ if [ -f /proc/self/coredump_filter ]; then
2222
fi
2323
fi
2424

25-
if [ $(uname -s) = "Darwin" ]; then
25+
if [ "$(uname -s)" = "Darwin" ]; then
2626
core_pattern_mac=$(/usr/sbin/sysctl -n "kern.corefile")
2727
if [ "$core_pattern_mac" = "dump_%N.%P.core" ]; then
2828
echo "Enabling coredumps"

‎.evergreen/scripts/check-import-time.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/bin/bash
2+
3+
. .evergreen/scripts/env.sh
4+
set -x
5+
export BASE_SHA="$1"
6+
export HEAD_SHA="$2"
7+
bash .evergreen/run-import-time-test.sh

‎.evergreen/scripts/cleanup.sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#!/bin/bash
2+
3+
. .evergreen/scripts/env.sh
4+
if [ -f "$DRIVERS_TOOLS"/.evergreen/csfle/secrets-export.sh ]; then
5+
. .evergreen/hatch.sh encryption:teardown
6+
fi
7+
rm -rf "${DRIVERS_TOOLS}" || true
8+
rm -f ./secrets-export.sh || true

‎.evergreen/scripts/fix-absolute-paths.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
set +x
44
. src/.evergreen/scripts/env.sh
5+
# shellcheck disable=SC2044
56
for filename in $(find $DRIVERS_TOOLS -name \*.json); do
67
perl -p -i -e "s|ABSOLUTE_PATH_REPLACEMENT_TOKEN|$DRIVERS_TOOLS|g" $filename
78
done

‎.evergreen/scripts/make-files-executable.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
set +x
44
. src/.evergreen/scripts/env.sh
5-
for i in $(find $DRIVERS_TOOLS/.evergreen $PROJECT_DIRECTORY/.evergreen -name \*.sh); do
6-
chmod +x $i
5+
# shellcheck disable=SC2044
6+
for i in $(find "$DRIVERS_TOOLS"/.evergreen "$PROJECT_DIRECTORY"/.evergreen -name \*.sh); do
7+
chmod +x "$i"
78
done

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#!/bin/bash
22

3+
. .evergreen/scripts/env.sh
34
# Disable xtrace for security reasons (just in case it was accidentally set).
45
set +x
56
set -o errexit

‎.evergreen/scripts/run-aws-ecs-auth-test.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#!/bin/bash
22

3+
# shellcheck disable=SC2154
34
if [ "${skip_ECS_auth_test}" = "true" ]; then
45
echo "This platform does not support the ECS auth test, skipping..."
56
exit 0

‎.evergreen/scripts/run-gcpkms-fail-test.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/bin/bash
2+
3+
. .evergreen/scripts/env.sh
4+
export PYTHON_BINARY=/opt/mongodbtoolchain/v4/bin/python3
5+
export LIBMONGOCRYPT_URL=https://s3.amazonaws.com/mciuploads/libmongocrypt/debian11/master/latest/libmongocrypt.tar.gz
6+
SKIP_SERVERS=1 bash ./.evergreen/setup-encryption.sh
7+
SUCCESS=false TEST_FLE_GCP_AUTO=1 ./.evergreen/hatch.sh test:test-eg

0 commit comments

Comments
 (0)