diff options
| author | Jonathan Reams <jbreams@mongodb.com> | 2019-07-11 12:29:00 -0400 |
|---|---|---|
| committer | Jonathan Reams <jbreams@mongodb.com> | 2019-07-12 16:36:02 -0400 |
| commit | 75e47b701d34c9ef7beb0482121ac8b62d2d4991 (patch) | |
| tree | 9e8114d95b39e0e276022d128e6009268796df95 | |
| parent | e6c531c7bc01e628052792a5c94c6da3e5779adf (diff) | |
| download | mongo-75e47b701d34c9ef7beb0482121ac8b62d2d4991.tar.gz | |
SERVER-41939 Fix external_auth suite to work with new LDAP proxy test
| -rw-r--r-- | etc/evergreen.yml | 32 | ||||
| -rw-r--r-- | etc/pip/components/external_auth.req | 9 | ||||
| -rw-r--r-- | etc/pip/dev-requirements.txt | 1 | ||||
| -rw-r--r-- | etc/pip/external-auth-requirements.txt | 1 |
4 files changed, 42 insertions, 1 deletions
diff --git a/etc/evergreen.yml b/etc/evergreen.yml index b830211f343..a7de4f4a2ac 100644 --- a/etc/evergreen.yml +++ b/etc/evergreen.yml @@ -319,6 +319,7 @@ variables: - name: causally_consistent_jscore_txns_passthrough - name: .encrypt !.aggregation !.gcm - name: external_auth + - name: external_auth_windows distros: - windows-64-2016 - name: .jscore .common !.compat !.sharding @@ -6104,9 +6105,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 @@ -9401,6 +9430,7 @@ buildvariants: - windows-64-vs2017-compile - name: .encrypt !.aggregation !.replica_sets !.sharding !.jscore - name: external_auth + - name: external_auth_windows distros: - windows-64-2016 - name: .jscore .common !.compat !.sharding 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/dev-requirements.txt b/etc/pip/dev-requirements.txt index bd3471b61eb..fe145f5c48f 100644 --- a/etc/pip/dev-requirements.txt +++ b/etc/pip/dev-requirements.txt @@ -4,3 +4,4 @@ -r components/compile.req -r components/lint.req -r components/resmoke.req +-r components/external_auth.req 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 |