diff options
| author | Daniel Moody <daniel.moody@mongodb.com> | 2022-07-13 21:33:28 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-07-13 22:34:55 +0000 |
| commit | 18749f9e88ba9cfe5605530e3fa4b82922012f95 (patch) | |
| tree | c6383499933d7483ec82e1179ffd5e1366f1a671 | |
| parent | ca6145312b0c00e7f8632d8b68c6acf7ccd0fba4 (diff) | |
| download | mongo-18749f9e88ba9cfe5605530e3fa4b82922012f95.tar.gz | |
SERVER-66968 add resmoke environment options to local usage text
| -rw-r--r-- | buildscripts/resmokelib/run/__init__.py | 10 | ||||
| -rw-r--r-- | evergreen/resmoke_tests_execute.sh | 8 |
2 files changed, 11 insertions, 7 deletions
diff --git a/buildscripts/resmokelib/run/__init__.py b/buildscripts/resmokelib/run/__init__.py index 6186d9c18d1..85d6fc7a78b 100644 --- a/buildscripts/resmokelib/run/__init__.py +++ b/buildscripts/resmokelib/run/__init__.py @@ -270,13 +270,17 @@ class TestRunner(Subcommand): # pylint: disable=too-many-instance-attributes config.MONGOD_SET_PARAMETERS) self._resmoke_logger.info("Fuzzed wiredTigerConnectionString: %s", config.WT_ENGINE_CONFIG) + resmoke_env_options = '' + if os.path.exists('resmoke_env_options.txt'): + with open('resmoke_env_options.txt') as fin: + resmoke_env_options = fin.read().strip() - self._resmoke_logger.info("resmoke.py invocation for local usage: %s", - local_resmoke_invocation) + self._resmoke_logger.info("resmoke.py invocation for local usage: %s %s", + resmoke_env_options, local_resmoke_invocation) if config.EVERGREEN_TASK_ID: with open("local-resmoke-invocation.txt", "w") as fh: - fh.write(local_resmoke_invocation) + fh.write(f"{resmoke_env_options} {local_resmoke_invocation}") def _log_resmoke_summary(self, suites): """Log a summary of the resmoke run.""" diff --git a/evergreen/resmoke_tests_execute.sh b/evergreen/resmoke_tests_execute.sh index ce1ecc7b582..9e38c311cf2 100644 --- a/evergreen/resmoke_tests_execute.sh +++ b/evergreen/resmoke_tests_execute.sh @@ -112,6 +112,9 @@ if [[ ${disable_unit_tests} = "false" && ! -f ${skip_tests} ]]; then suite_name=${suite} fi + resmoke_env_options="${gcov_environment} ${lang_environment} ${san_options} ${snmp_config_path}" + echo $resmoke_env_options > resmoke_env_options.txt + # The "resmoke_wrapper" expansion is used by the 'burn_in_tests' task to wrap the resmoke.py # invocation. It doesn't set any environment variables and should therefore come last in # this list of expansions. @@ -119,10 +122,7 @@ if [[ ${disable_unit_tests} = "false" && ! -f ${skip_tests} ]]; then PATH="$path_value" \ AWS_PROFILE=${aws_profile_remote} \ eval \ - ${gcov_environment} \ - ${lang_environment} \ - ${san_options} \ - ${snmp_config_path} \ + $resmoke_env_options \ ${resmoke_wrapper} \ $python buildscripts/resmoke.py run \ ${record_with} \ |