From bd01a61df2aa0d32f18a60259fbc7e63dd1013d3 Mon Sep 17 00:00:00 2001 From: Zack Winter <3457246+zackwintermdb@users.noreply.github.com> Date: Fri, 16 Feb 2024 11:33:47 -0800 Subject: [PATCH] SERVER-86713 Add EngFlow creds setup to linter and formatter tasks (#19070) GitOrigin-RevId: b34e71f9fe85a89621e7194c09c496e89d05e4c9 --- etc/evergreen_yml_components/tasks/compile_tasks.yml | 2 ++ etc/evergreen_yml_components/tasks/misc_tasks.yml | 6 ++++++ evergreen/scons_lint.sh | 4 ++++ evergreen/scons_raw_compile.sh | 3 +++ 4 files changed, 15 insertions(+) diff --git a/etc/evergreen_yml_components/tasks/compile_tasks.yml b/etc/evergreen_yml_components/tasks/compile_tasks.yml index e7e2c75bef3..4d4bcdcd827 100644 --- a/etc/evergreen_yml_components/tasks/compile_tasks.yml +++ b/etc/evergreen_yml_components/tasks/compile_tasks.yml @@ -2569,6 +2569,7 @@ task_groups: - func: "set up credentials" - func: "set up win mount script" - func: "generate compile expansions" + - func: "get engflow creds" teardown_group: - func: "f_expansions_write" - func: "attach report" @@ -2660,6 +2661,7 @@ task_groups: - func: "apply compile expansions" - func: "set task expansion macros" - func: "f_expansions_write" + - func: "get engflow creds" teardown_task: - func: "attach scons logs" setup_group_can_fail_task: true diff --git a/etc/evergreen_yml_components/tasks/misc_tasks.yml b/etc/evergreen_yml_components/tasks/misc_tasks.yml index e0e8559b6e5..8a505bfe10a 100644 --- a/etc/evergreen_yml_components/tasks/misc_tasks.yml +++ b/etc/evergreen_yml_components/tasks/misc_tasks.yml @@ -554,6 +554,7 @@ tasks: - func: "cleanup environment" - func: "set up venv" - func: "upload pip requirements" + - func: "get engflow creds" - func: "scons lint" vars: targets: lint-clang-format @@ -573,6 +574,7 @@ tasks: - func: "cleanup environment" - func: "set up venv" - func: "upload pip requirements" + - func: "get engflow creds" - func: "scons lint" vars: targets: lint-lint.py @@ -587,6 +589,7 @@ tasks: - func: "cleanup environment" - func: "set up venv" - func: "upload pip requirements" + - func: "get engflow creds" - func: "scons lint" vars: targets: lint-errorcodes @@ -606,6 +609,7 @@ tasks: - func: "cleanup environment" - func: "set up venv" - func: "upload pip requirements" + - func: "get engflow creds" - func: "scons lint" vars: targets: lint-eslint @@ -726,6 +730,7 @@ tasks: - func: "cleanup environment" - func: "set up venv" - func: "upload pip requirements" + - func: "get engflow creds" - func: "scons lint" vars: targets: lint-pylinters @@ -745,6 +750,7 @@ tasks: - func: "cleanup environment" - func: "set up venv" - func: "upload pip requirements" + - func: "get engflow creds" - func: "scons lint" vars: targets: lint-sconslinters diff --git a/evergreen/scons_lint.sh b/evergreen/scons_lint.sh index c5c7ead5aa8..addd2412be3 100755 --- a/evergreen/scons_lint.sh +++ b/evergreen/scons_lint.sh @@ -17,6 +17,10 @@ export MYPY="$( which mypy )" echo "Found mypy executable at '$MYPY'" + +echo "Setting evergreen tmp dir to $TMPDIR" +compile_flags="$compile_flags --evergreen-tmp-dir='${TMPDIR}'" + export extra_flags="" eval ${compile_env} python3 ./buildscripts/scons.py ${compile_flags} $extra_flags --stack-size=1024 GITDIFFFLAGS="${revision}" REVISION="${revision}" ENTERPRISE_REV="${enterprise_rev}" ${targets} | tee scons-lint.log exit_code=$? diff --git a/evergreen/scons_raw_compile.sh b/evergreen/scons_raw_compile.sh index 7268961d465..7e9de157f98 100755 --- a/evergreen/scons_raw_compile.sh +++ b/evergreen/scons_raw_compile.sh @@ -16,6 +16,9 @@ activate_venv set -o pipefail +echo "Setting evergreen tmp dir to $TMPDIR" +compile_flags="$compile_flags --evergreen-tmp-dir='${TMPDIR}'" + eval ${compile_env} $python ./buildscripts/scons.py \ ${compile_flags} ${task_compile_flags} \ ${targets} | tee scons_stdout.log