PYTHON-4631: Pushed PREPARE_SHELL creation into an env.sh file #1788

Jibola · 2024-08-12T17:57:57Z

As part of the larger epic to remove our dependency on in-lined scripts. We're making a conscious effort to remove all the shell.exec calls in our evergreen tests and make then subprocess calls that call into a file. The first step in that process comes from removing our biggest offender "PREPARE_SHELL".

This PR will achieve a few things:

- Move the PREPARE_SHELL call to the configure-expansions.sh file
- Create a directory for "scripts" within evergreen to keep the code tidy

…ess works well

blink1073 · 2024-08-14T20:48:40Z

You have a merge conflict. 🫤

.evergreen/config.yml

…ARE_SHELL}` Co-authored-by: Steven Silvester <[email protected]>

.evergreen/config.yml

blink1073 · 2024-08-30T15:46:44Z

FAILED test/test_discovery_and_monitoring.py::TestUnifiedLoggingStandalone::test_Topology_lifecycle - AssertionError: 7 != 8

I opened PYTHON-4705 for this.

blink1073

LGTM!

.evergreen/config.yml

Jibola added 18 commits August 12, 2024 13:57

Pushed PREPARE_SHELL creation into an env.sh file

aa44ef7

push env.sh into scripts folder

f3a479c

run in scripts/env.sh

0d80367

set configure-env.sh into the scripts path

8fcc5ac

Added safeguard to check if env.sh file already created

cf7a58e

fix .sh

5568856

removed mkdir scripts call

fe6932a

check env.sh save region

88029d4

added more spot debugging

ac46e2b

find scripts in evergreen

94661f8

adjust sourcing based on working_dir

c7ff988

remove the failing ls calls

7d56822

fix the export logic

13c1886

Have prepare resources called without working_dir specified

177e6d2

remove all expansions created from the expansions.yml update

6664e40

remove calls to include_expansions_to_env and use shell until subproc…

7a6298d

…ess works well

fix yml config

34e76c4

remove almost all subprocess calls

ebdd27a

mongodb-drivers-pr-bot bot requested a review from blink1073 August 14, 2024 19:40

blink1073 reviewed Aug 14, 2024

View reviewed changes

.evergreen/config.yml Show resolved Hide resolved

Jibola added 9 commits August 19, 2024 12:23

Merge branch 'master' into PYTHON-4631

8d08d5b

fix shellcheck issues

105035c

add DRIVERS_TOOLS and PROJECT_DIRECTORY to expansions

8c9259d

replace env variable usage with expansion usage

7c14306

fix system failures

f367150

fix aws lambda

a624d0d

Merge branch 'master' into PYTHON-4631

c48dbeb

->

ef5a7fd

->

215e1ff

Jibola requested a review from blink1073 August 28, 2024 18:41

blink1073 requested changes Aug 28, 2024

View reviewed changes

Jibola added 2 commits August 29, 2024 11:25

convert some tests back to using subprocess

b004804

convert azurekms tests to subprocess

24632e1

blink1073 reviewed Aug 29, 2024

View reviewed changes

.evergreen/config.yml Outdated Show resolved Hide resolved

convert another to subprocess

67abf6e

Jibola commented Aug 30, 2024

View reviewed changes

.evergreen/config.yml Outdated Show resolved Hide resolved

Jibola commented Aug 30, 2024

View reviewed changes

.evergreen/config.yml Outdated Show resolved Hide resolved

Jibola commented Aug 30, 2024

View reviewed changes

.evergreen/config.yml Outdated Show resolved Hide resolved

Jibola commented Aug 30, 2024

View reviewed changes

.evergreen/config.yml Show resolved Hide resolved

Jibola commented Aug 30, 2024

View reviewed changes

.evergreen/config.yml Outdated Show resolved Hide resolved

Jibola commented Aug 30, 2024

View reviewed changes

.evergreen/config.yml Outdated Show resolved Hide resolved

Applied Code Review Suggestions and Made sure to only replace `${PREP…

86a8af7

…ARE_SHELL}` Co-authored-by: Steven Silvester <[email protected]>

Jibola commented Aug 30, 2024

View reviewed changes

.evergreen/config.yml Outdated Show resolved Hide resolved

remove braces on DRIVERS_TOOLS in prepare resources

cd59510

blink1073 previously approved these changes Aug 30, 2024

View reviewed changes

return DRIVERS_TOOLS expansion to run-gcpkms-test

d948fc7

Jibola dismissed blink1073’s stale review via d948fc7 August 30, 2024 15:53

blink1073 previously approved these changes Aug 30, 2024

View reviewed changes

Jibola commented Sep 3, 2024

View reviewed changes

.evergreen/config.yml Outdated Show resolved Hide resolved

Jibola commented Sep 3, 2024

View reviewed changes

.evergreen/config.yml Outdated Show resolved Hide resolved

Jibola commented Sep 3, 2024

View reviewed changes

.evergreen/config.yml Outdated Show resolved Hide resolved

Jibola commented Sep 3, 2024

View reviewed changes

.evergreen/config.yml Outdated Show resolved Hide resolved

Revert removal of "include_expansion_in_env" for DRIVERS_TOOLS

27b8ceb

Jibola dismissed blink1073’s stale review via 27b8ceb September 3, 2024 20:48

Jibola requested a review from blink1073 September 3, 2024 20:54

blink1073 approved these changes Sep 3, 2024

View reviewed changes

Jibola merged commit 26c5504 into mongodb:master Sep 5, 2024
31 of 34 checks passed

Jibola deleted the PYTHON-4631 branch September 5, 2024 13:39

PYTHON-4631: Pushed PREPARE_SHELL creation into an env.sh file #1788

PYTHON-4631: Pushed PREPARE_SHELL creation into an env.sh file #1788

Uh oh!

Conversation

Jibola commented Aug 12, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

blink1073 commented Aug 14, 2024

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

blink1073 commented Aug 30, 2024

Uh oh!

blink1073 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Jibola commented Aug 12, 2024 •

edited

Loading