diff options
| author | Jonathan Reams <jonathan.reams@mongodb.com> | 2019-09-16 15:51:15 +0000 |
|---|---|---|
| committer | evergreen <evergreen@mongodb.com> | 2019-09-16 15:51:15 +0000 |
| commit | 2e1c5a80e63fd1e569575f3ecba4522415a43c14 (patch) | |
| tree | eed621ea5b1bd46a2947c83b441a95bbc98a455f | |
| parent | e3245cafe04a4be60abf4994452b0a62585acdba (diff) | |
| download | mongo-2e1c5a80e63fd1e569575f3ecba4522415a43c14.tar.gz | |
SERVER-41939 Fix external_auth suite to work with new LDAP proxy test
(cherry picked from commit 75e47b701d34c9ef7beb0482121ac8b62d2d4991)
(cherry picked from commit 7494fc8458ea265a41aa279d16ddb0d988b5331f)
| -rw-r--r-- | etc/evergreen.yml | 33 | ||||
| -rw-r--r-- | etc/pip/components/external_auth.req | 9 | ||||
| -rw-r--r-- | etc/pip/external-auth-requirements.txt | 1 |
3 files changed, 42 insertions, 1 deletions
diff --git a/etc/evergreen.yml b/etc/evergreen.yml index 0e7bdf39040..319c183b666 100644 --- a/etc/evergreen.yml +++ b/etc/evergreen.yml @@ -316,6 +316,7 @@ variables: - name: buildscripts_test - name: ese - name: external_auth + - name: external_auth_windows distros: - windows-64-2016 - name: jsCore @@ -3338,6 +3339,7 @@ tasks: - "*Test" - "./**.pdb" - "./**.msi" + - "./etc/pip/**" - "./etc/*san.suppressions" - "./etc/repo_config.yaml" - "./etc/test_lifecycle.yml" @@ -5326,9 +5328,37 @@ tasks: name: external_auth commands: - func: "do setup" + - command: shell.exec + params: + shell: bash + script: | + set -o errexit + set -o verbose + ${activate_virtualenv} + + # Not all git get project calls clone into ${workdir}/src so we allow + # callers to tell us where the pip requirements files are. + pip_dir="${pip_dir}" + if [[ -z $pip_dir ]]; then + # Default to most common location + pip_dir="${workdir}/src/etc/pip" + fi + + # Same as above we have to use quotes to preserve the + # Windows path separator + external_auth_txt="$pip_dir/external-auth-requirements.txt" + python -m pip install -r "$external_auth_txt" + - func: "run tests" + vars: + resmoke_args: --suites=external_auth --excludeWithAnyTags=requires_domain_controller --storageEngine=wiredTiger + +- <<: *task_template + name: external_auth_windows + commands: + - func: "do setup" - func: "run tests" vars: - resmoke_args: --suites=external_auth --storageEngine=wiredTiger + resmoke_args: --suites=external_auth --includeWithAnyTags=requires_domain_controller --storageEngine=wiredTiger - <<: *task_template name: sharding_gle_auth_basics_passthrough @@ -8727,6 +8757,7 @@ buildvariants: - windows-64-vs2015-large - name: ese - name: external_auth + - name: external_auth_windows distros: - windows-64-2016 - name: jsCore diff --git a/etc/pip/components/external_auth.req b/etc/pip/components/external_auth.req new file mode 100644 index 00000000000..b793937dc5b --- /dev/null +++ b/etc/pip/components/external_auth.req @@ -0,0 +1,9 @@ +# These are the dependencies of ldaptor +passlib == 1.7.1 +pyOpenSSL == 19.0.0 +pyparsing == 2.4.0 +service_identity == 18.1.0 +twisted == 19.2.1 +zope.interface == 4.6.0 + +ldaptor == 19.0.0 diff --git a/etc/pip/external-auth-requirements.txt b/etc/pip/external-auth-requirements.txt new file mode 100644 index 00000000000..1ba79f29bde --- /dev/null +++ b/etc/pip/external-auth-requirements.txt @@ -0,0 +1 @@ +-r components/external_auth.req |