summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--etc/evergreen.yml6
-rw-r--r--etc/pip/components/resmoke.req2
2 files changed, 5 insertions, 3 deletions
diff --git a/etc/evergreen.yml b/etc/evergreen.yml
index 555a59a37c5..0e57647558a 100644
--- a/etc/evergreen.yml
+++ b/etc/evergreen.yml
@@ -8111,8 +8111,9 @@ buildvariants:
- amazon2-test
expansions:
additional_package_targets: archive-mongocryptd archive-mongocryptd-debug
+ # TODO BUILD-13887 should fix uses_pykmip incompatibility.
test_flags: >-
- --excludeWithAnyTags=SERVER-34286,incompatible_with_amazon_linux
+ --excludeWithAnyTags=SERVER-34286,incompatible_with_amazon_linux,uses_pykmip
push_path: linux
push_bucket: downloads.10gen.com
push_name: linux
@@ -8227,7 +8228,8 @@ buildvariants:
push_name: linux
push_arch: aarch64-enterprise-amazon2
compile_flags: --ssl MONGO_DISTMOD=amazon2 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars
- test_flags: --excludeWithAnyTags=incompatible_with_amazon_linux,requires_ldap_pool
+ # TODO BUILD-13887 should fix uses_pykmip incompatibility.
+ test_flags: --excludeWithAnyTags=incompatible_with_amazon_linux,requires_ldap_pool,uses_pykmip
has_packages: true
packager_script: packager_enterprise.py
packager_arch: aarch64
diff --git a/etc/pip/components/resmoke.req b/etc/pip/components/resmoke.req
index 0a68e63a0cd..c16213fee98 100644
--- a/etc/pip/components/resmoke.req
+++ b/etc/pip/components/resmoke.req
@@ -1,5 +1,5 @@
curatorbin == 1.2.1
-PyKMIP == 0.4.0 # It's now 0.8.0. We're far enough back to have API conflicts.
+PyKMIP == 0.10.0
evergreen.py == 3.2.0
jinja2
MarkupSafe == 1.1.0 # See SERVER-57036, this is a transitive dependency of jinja2