From 687f8a14669adfba45c054df7e7b4c5cd3f293e5 Mon Sep 17 00:00:00 2001 From: Shane Harvey Date: Fri, 25 Jun 2021 15:34:48 -0700 Subject: [PATCH] PYTHON-2774 Migrate snappy testing to from Ubuntu 18 to amazon1-2018 --- .evergreen/config.yml | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/.evergreen/config.yml b/.evergreen/config.yml index 01daef35aa..a631f91e46 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -2397,28 +2397,13 @@ buildvariants: display_name: "${c-extensions} ${python-version} ${platform} ${auth} ${ssl} ${coverage}" tasks: *all-server-versions -- matrix_name: "tests-python-version-ubuntu18-compression" +- matrix_name: "tests-python-version-compression" matrix_spec: - platform: [awslinux, ubuntu-18.04] + platform: [awslinux] python-version: ["2.7", "3.4", "3.5", "3.6", "3.7", "3.8", "3.9", "pypy", "pypy3.5", "pypy3.6", "pypy3.7", "jython2.7"] c-extensions: "*" compression: "*" exclude_spec: - # Only test snappy on Ubuntu-18.04 as Ubuntu 18.04 images have libsnappy-dev installed - - platform: awslinux - python-version: "*" - c-extensions: "*" - compression: ["snappy"] - # Ubuntu-18.04 does not have Python 3.4 installed - - platform: ubuntu-18.04 - python-version: ["3.4"] - c-extensions: "*" - compression: ["snappy"] - # Only test zlib and zstd on Amazon Linux - - platform: ubuntu-18.04 - python-version: "*" - c-extensions: "*" - compression: ["zlib", "zstd"] # These interpreters are always tested without extensions. - platform: "*" python-version: ["pypy", "pypy3.5", "pypy3.6", "pypy3.7", "jython2.7"] @@ -2443,12 +2428,12 @@ buildvariants: rules: # Server versions 3.6+ support snappy and zlib. - if: + platform: "*" python-version: "*" c-extensions: "*" compression: ["snappy", "zlib"] then: add_tasks: - - "test-5.0-standalone" - "test-4.0-standalone" - "test-3.6-standalone"