Commit aeb5e4b

authored

Merge v1.x into v2.0 (#1705)

2 parents 3e4a39c + 1ca9d0f commit aeb5e4bCopy full SHA for aeb5e4b

File tree

-2

lines changed

-2

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,9 +9,9 @@ command_type: system`
`9`	`9`	`# Fail builds when pre tasks fail.`
`10`	`10`	`pre_error_fails_task: true`
`11`	`11`
`12`		`-# Protect ourselves against rogue test case that runs forever. Tasks are killed after 20 minutes, which shouldn't occur`
	`12`	`+# Protect ourselves against rogue test case that runs forever. Tasks are killed after 30 minutes, which shouldn't occur`
`13`	`13`	`# under normal circumstances.`
`14`		`-exec_timeout_secs: 1200`
	`14`	`+exec_timeout_secs: 1800`
`15`	`15`
`16`	`16`	`# These pre and post rules apply to all tasks not part of a task group, which should only ever be tests against local`
`17`	`17`	`# MongoDB instances. All other tasks that require special preparation should be run from within a task group`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -158,6 +158,7 @@ functions:`
`158`	`158`	`"bootstrap mongohoused":`
`159`	`159`	`- command: shell.exec`
`160`	`160`	`params:`
	`161`	`+ include_expansions_in_env: [AWS_SECRET_ACCESS_KEY, AWS_ACCESS_KEY_ID, AWS_SESSION_TOKEN]`
`161`	`162`	`script: \|`
`162`	`163`	`cd ${DRIVERS_TOOLS}/.evergreen/atlas_data_lake`
`163`	`164`

Comments

(0)