diff options
| author | Ben Caimano <ben.caimano@10gen.com> | 2020-10-12 22:31:06 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-10-12 23:00:38 +0000 |
| commit | 8468e69c2eb6b5aee8a8828c7c22c22073916735 (patch) | |
| tree | 98b421e6dc19edd9bf5a532aaa49cf7d88498832 /etc | |
| parent | 95f856c69f133a934200181da25ece071b84dbc1 (diff) | |
| download | mongo-8468e69c2eb6b5aee8a8828c7c22c22073916735.tar.gz | |
Revert "SERVER-49504: Allow resmoke's mongo shell to log to Jasper"
This reverts commit 308cc2fa21eb3a3d2b53cb47bb3dcdd3b259bf20.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/evergreen.yml | 7 | ||||
| -rw-r--r-- | etc/pip/components/resmoke.req | 6 |
2 files changed, 3 insertions, 10 deletions
diff --git a/etc/evergreen.yml b/etc/evergreen.yml index 01e4e264adf..9595250a337 100644 --- a/etc/evergreen.yml +++ b/etc/evergreen.yml @@ -1228,7 +1228,6 @@ functions: # Windows path separator toolchain_txt="$pip_dir/toolchain-requirements.txt" ${activate_virtualenv} - python -m pip install --upgrade pip python -m pip install -r "$toolchain_txt" -q python -m pip freeze > pip-requirements.txt @@ -1367,10 +1366,6 @@ functions: working_dir: src shell: bash script: | - # export these before verbose is set to avoid sharing sensitive info - export CEDAR_USERNAME=${cedar_user} - export CEDAR_API_KEY=${cedar_api_key} - set -o errexit set -o verbose @@ -1471,8 +1466,6 @@ functions: # this list of expansions. set +o errexit PATH="$path_value" \ - CEDAR_USERNAME=${cedar_user} \ - CEDAR_PASSWORD AWS_PROFILE=${aws_profile_remote} \ ${gcov_environment} \ ${lang_environment} \ diff --git a/etc/pip/components/resmoke.req b/etc/pip/components/resmoke.req index 3f00b3e623e..29749bbea9b 100644 --- a/etc/pip/components/resmoke.req +++ b/etc/pip/components/resmoke.req @@ -7,7 +7,7 @@ ocspresponder == 0.5.0 flask == 1.1.1 ocspbuilder == 0.10.2 # TODO: uncomment these lines with SERVER-48156 -# grpcio == 1.28.1; platform_machine == "x86_64" -# grpcio-tools == 1.28.1; platform_machine == "x86_64" -# googleapis-common-protos == 1.51.0; platform_machine == "x86_64" +#grpcio == 1.28.1; platform_machine != "x86_64" +#grpcio-tools == 1.28.1; platform_machine != "x86_64" +#googleapis-common-protos == 1.51.0; platform_machine != "x86_64" blackduck == 0.0.51 |