From e5edeaeb18d4bb82dad90d841eacb1f912b5382f Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Wed, 2 Apr 2025 10:21:55 -0500 Subject: [PATCH 1/8] PYTHON-5261 Clean up compression variants --- .evergreen/generated_configs/tasks.yml | 321 +++++++++++++++++++++- .evergreen/generated_configs/variants.yml | 147 +++++----- .evergreen/scripts/generate_config.py | 67 +++-- 3 files changed, 414 insertions(+), 121 deletions(-) diff --git a/.evergreen/generated_configs/tasks.yml b/.evergreen/generated_configs/tasks.yml index e70f0cbdfb..5cda2f17a0 100644 --- a/.evergreen/generated_configs/tasks.yml +++ b/.evergreen/generated_configs/tasks.yml @@ -9,14 +9,14 @@ tasks: tags: [atlas_connect] # Atlas data lake tests - - name: test-atlas-data-lake-with_ext + - name: test-atlas-data-lake-without_ext commands: - func: run tests vars: TEST_NAME: data_lake NO_EXT: "1" tags: [atlas_data_lake] - - name: test-atlas-data-lake-without_ext + - name: test-atlas-data-lake-with_ext commands: - func: run tests vars: @@ -713,6 +713,323 @@ tasks: AWS_ROLE_SESSION_NAME: test tags: [auth-aws, auth-aws-web-identity] + # Compression tests + - name: test-compression-v4.0-python3.9-no-c + commands: + - func: run server + vars: + VERSION: "4.0" + - func: run tests + tags: [compression] + - name: test-compression-v4.2-python3.9-no-c + commands: + - func: run server + vars: + VERSION: "4.2" + - func: run tests + tags: [compression] + - name: test-compression-v4.4-python3.9-no-c + commands: + - func: run server + vars: + VERSION: "4.4" + - func: run tests + tags: [compression] + - name: test-compression-v5.0-python3.9-no-c + commands: + - func: run server + vars: + VERSION: "5.0" + - func: run tests + tags: [compression] + - name: test-compression-v6.0-python3.9-no-c + commands: + - func: run server + vars: + VERSION: "6.0" + - func: run tests + tags: [compression] + - name: test-compression-v7.0-python3.9-no-c + commands: + - func: run server + vars: + VERSION: "7.0" + - func: run tests + tags: [compression] + - name: test-compression-v8.0-python3.9-no-c + commands: + - func: run server + vars: + VERSION: "8.0" + - func: run tests + tags: [compression] + - name: test-compression-rapid-python3.9-no-c + commands: + - func: run server + vars: + VERSION: rapid + - func: run tests + tags: [compression] + - name: test-compression-latest-python3.9-no-c + commands: + - func: run server + vars: + VERSION: latest + - func: run tests + tags: [compression] + - name: test-compression-v4.0-python3.9 + commands: + - func: run server + vars: + VERSION: "4.0" + - func: run tests + tags: [compression] + - name: test-compression-v4.2-python3.9 + commands: + - func: run server + vars: + VERSION: "4.2" + - func: run tests + tags: [compression] + - name: test-compression-v4.4-python3.9 + commands: + - func: run server + vars: + VERSION: "4.4" + - func: run tests + tags: [compression] + - name: test-compression-v5.0-python3.9 + commands: + - func: run server + vars: + VERSION: "5.0" + - func: run tests + tags: [compression] + - name: test-compression-v6.0-python3.9 + commands: + - func: run server + vars: + VERSION: "6.0" + - func: run tests + tags: [compression] + - name: test-compression-v7.0-python3.9 + commands: + - func: run server + vars: + VERSION: "7.0" + - func: run tests + tags: [compression] + - name: test-compression-v8.0-python3.9 + commands: + - func: run server + vars: + VERSION: "8.0" + - func: run tests + tags: [compression] + - name: test-compression-rapid-python3.9 + commands: + - func: run server + vars: + VERSION: rapid + - func: run tests + tags: [compression] + - name: test-compression-latest-python3.9 + commands: + - func: run server + vars: + VERSION: latest + - func: run tests + tags: [compression] + - name: test-compression-v4.0-python3.13-no-c + commands: + - func: run server + vars: + VERSION: "4.0" + - func: run tests + tags: [compression] + - name: test-compression-v4.2-python3.13-no-c + commands: + - func: run server + vars: + VERSION: "4.2" + - func: run tests + tags: [compression] + - name: test-compression-v4.4-python3.13-no-c + commands: + - func: run server + vars: + VERSION: "4.4" + - func: run tests + tags: [compression] + - name: test-compression-v5.0-python3.13-no-c + commands: + - func: run server + vars: + VERSION: "5.0" + - func: run tests + tags: [compression] + - name: test-compression-v6.0-python3.13-no-c + commands: + - func: run server + vars: + VERSION: "6.0" + - func: run tests + tags: [compression] + - name: test-compression-v7.0-python3.13-no-c + commands: + - func: run server + vars: + VERSION: "7.0" + - func: run tests + tags: [compression] + - name: test-compression-v8.0-python3.13-no-c + commands: + - func: run server + vars: + VERSION: "8.0" + - func: run tests + tags: [compression] + - name: test-compression-rapid-python3.13-no-c + commands: + - func: run server + vars: + VERSION: rapid + - func: run tests + tags: [compression] + - name: test-compression-latest-python3.13-no-c + commands: + - func: run server + vars: + VERSION: latest + - func: run tests + tags: [compression] + - name: test-compression-v4.0-python3.13 + commands: + - func: run server + vars: + VERSION: "4.0" + - func: run tests + tags: [compression] + - name: test-compression-v4.2-python3.13 + commands: + - func: run server + vars: + VERSION: "4.2" + - func: run tests + tags: [compression] + - name: test-compression-v4.4-python3.13 + commands: + - func: run server + vars: + VERSION: "4.4" + - func: run tests + tags: [compression] + - name: test-compression-v5.0-python3.13 + commands: + - func: run server + vars: + VERSION: "5.0" + - func: run tests + tags: [compression] + - name: test-compression-v6.0-python3.13 + commands: + - func: run server + vars: + VERSION: "6.0" + - func: run tests + tags: [compression] + - name: test-compression-v7.0-python3.13 + commands: + - func: run server + vars: + VERSION: "7.0" + - func: run tests + tags: [compression] + - name: test-compression-v8.0-python3.13 + commands: + - func: run server + vars: + VERSION: "8.0" + - func: run tests + tags: [compression] + - name: test-compression-rapid-python3.13 + commands: + - func: run server + vars: + VERSION: rapid + - func: run tests + tags: [compression] + - name: test-compression-latest-python3.13 + commands: + - func: run server + vars: + VERSION: latest + - func: run tests + tags: [compression] + - name: test-compression-v4.0-pypy3.10 + commands: + - func: run server + vars: + VERSION: "4.0" + - func: run tests + tags: [compression] + - name: test-compression-v4.2-pypy3.10 + commands: + - func: run server + vars: + VERSION: "4.2" + - func: run tests + tags: [compression] + - name: test-compression-v4.4-pypy3.10 + commands: + - func: run server + vars: + VERSION: "4.4" + - func: run tests + tags: [compression] + - name: test-compression-v5.0-pypy3.10 + commands: + - func: run server + vars: + VERSION: "5.0" + - func: run tests + tags: [compression] + - name: test-compression-v6.0-pypy3.10 + commands: + - func: run server + vars: + VERSION: "6.0" + - func: run tests + tags: [compression] + - name: test-compression-v7.0-pypy3.10 + commands: + - func: run server + vars: + VERSION: "7.0" + - func: run tests + tags: [compression] + - name: test-compression-v8.0-pypy3.10 + commands: + - func: run server + vars: + VERSION: "8.0" + - func: run tests + tags: [compression] + - name: test-compression-rapid-pypy3.10 + commands: + - func: run server + vars: + VERSION: rapid + - func: run tests + tags: [compression] + - name: test-compression-latest-pypy3.10 + commands: + - func: run server + vars: + VERSION: latest + - func: run tests + tags: [compression] + # Doctest tests - name: test-doctests commands: diff --git a/.evergreen/generated_configs/variants.yml b/.evergreen/generated_configs/variants.yml index 892e50f9da..fa0ce9df72 100644 --- a/.evergreen/generated_configs/variants.yml +++ b/.evergreen/generated_configs/variants.yml @@ -160,90 +160,69 @@ buildvariants: - rhel87-small # Compression tests - - name: compression-snappy-rhel8-python3.9-no-c - tasks: - - name: .standalone .noauth .nossl .sync_async - display_name: Compression snappy RHEL8 Python3.9 No C - run_on: - - rhel87-small - expansions: - COMPRESSORS: snappy - NO_EXT: "1" - PYTHON_BINARY: /opt/python/3.9/bin/python3 - - name: compression-snappy-rhel8-python3.10 - tasks: - - name: .standalone .noauth .nossl .sync_async - display_name: Compression snappy RHEL8 Python3.10 - run_on: - - rhel87-small - expansions: - COMPRESSORS: snappy - PYTHON_BINARY: /opt/python/3.10/bin/python3 - - name: compression-zlib-rhel8-python3.11-no-c - tasks: - - name: .standalone .noauth .nossl .sync_async - display_name: Compression zlib RHEL8 Python3.11 No C - run_on: - - rhel87-small - expansions: - COMPRESSORS: zlib - NO_EXT: "1" - PYTHON_BINARY: /opt/python/3.11/bin/python3 - - name: compression-zlib-rhel8-python3.12 - tasks: - - name: .standalone .noauth .nossl .sync_async - display_name: Compression zlib RHEL8 Python3.12 - run_on: - - rhel87-small - expansions: - COMPRESSORS: zlib - PYTHON_BINARY: /opt/python/3.12/bin/python3 - - name: compression-zstd-rhel8-python3.13-no-c - tasks: - - name: .standalone .noauth .nossl .sync_async !.4.0 - display_name: Compression zstd RHEL8 Python3.13 No C - run_on: - - rhel87-small - expansions: - COMPRESSORS: zstd - NO_EXT: "1" - PYTHON_BINARY: /opt/python/3.13/bin/python3 - - name: compression-zstd-rhel8-python3.9 - tasks: - - name: .standalone .noauth .nossl .sync_async !.4.0 - display_name: Compression zstd RHEL8 Python3.9 - run_on: - - rhel87-small - expansions: - COMPRESSORS: zstd - PYTHON_BINARY: /opt/python/3.9/bin/python3 - - name: compression-snappy-rhel8-pypy3.10 - tasks: - - name: .standalone .noauth .nossl .sync_async - display_name: Compression snappy RHEL8 PyPy3.10 - run_on: - - rhel87-small - expansions: - COMPRESSORS: snappy - PYTHON_BINARY: /opt/python/pypy3.10/bin/python3 - - name: compression-zlib-rhel8-pypy3.10 - tasks: - - name: .standalone .noauth .nossl .sync_async - display_name: Compression zlib RHEL8 PyPy3.10 - run_on: - - rhel87-small - expansions: - COMPRESSORS: zlib - PYTHON_BINARY: /opt/python/pypy3.10/bin/python3 - - name: compression-zstd-rhel8-pypy3.10 - tasks: - - name: .standalone .noauth .nossl .sync_async !.4.0 - display_name: Compression zstd RHEL8 PyPy3.10 - run_on: - - rhel87-small - expansions: - COMPRESSORS: zstd - PYTHON_BINARY: /opt/python/pypy3.10/bin/python3 + - name: compression-snappy-rhel8 + tasks: + - name: . + - name: c + - name: o + - name: m + - name: p + - name: r + - name: e + - name: s + - name: s + - name: i + - name: o + - name: n + display_name: Compression snappy RHEL8 + run_on: + - rhel87-small + expansions: + COMPRESSOR: snappy + - name: compression-zlib-rhel8 + tasks: + - name: . + - name: c + - name: o + - name: m + - name: p + - name: r + - name: e + - name: s + - name: s + - name: i + - name: o + - name: n + display_name: Compression zlib RHEL8 + run_on: + - rhel87-small + expansions: + COMPRESSOR: zlib + - name: compression-zstd-rhel8 + tasks: + - name: . + - name: c + - name: o + - name: m + - name: p + - name: r + - name: e + - name: s + - name: s + - name: i + - name: o + - name: n + - name: " " + - name: "!" + - name: . + - name: "4" + - name: . + - name: "0" + display_name: Compression zstd RHEL8 + run_on: + - rhel87-small + expansions: + COMPRESSOR: zstd # Coverage report tests - name: coverage-report diff --git a/.evergreen/scripts/generate_config.py b/.evergreen/scripts/generate_config.py index 419bead92b..d78a404f5a 100644 --- a/.evergreen/scripts/generate_config.py +++ b/.evergreen/scripts/generate_config.py @@ -26,7 +26,7 @@ BATCHTIME_WEEK = 10080 AUTH_SSLS = [("auth", "ssl"), ("noauth", "ssl"), ("noauth", "nossl")] TOPOLOGIES = ["standalone", "replica_set", "sharded_cluster"] -C_EXTS = ["with_ext", "without_ext"] +C_EXTS = ["without_ext", "with_ext"] # By default test each of the topologies with a subset of auth/ssl. SUB_TASKS = [ ".sharded_cluster .auth .ssl", @@ -217,7 +217,7 @@ def get_variant_name(base: str, host: Host | None = None, **kwargs) -> str: def get_task_name(base: str, **kwargs): - return get_common_name(base, "-", **kwargs).lower() + return get_common_name(base, "-", **kwargs).replace(" ", "-").lower() def zip_cycle(*iterables, empty_default=None): @@ -423,42 +423,22 @@ def create_load_balancer_variants(): def create_compression_variants(): - # Compression tests - standalone versions of each server, across python versions, with and without c extensions. - # PyPy interpreters are always tested without extensions. + # Compression tests - standalone versions of each server, across python versions. host = DEFAULT_HOST - base_task = ".standalone .noauth .nossl .sync_async" - task_names = dict(snappy=[base_task], zlib=[base_task], zstd=[f"{base_task} !.4.0"]) + base_task = ".compression" variants = [] - for ind, (compressor, c_ext) in enumerate(product(["snappy", "zlib", "zstd"], C_EXTS)): - expansions = dict(COMPRESSORS=compressor) - handle_c_ext(c_ext, expansions) - base_name = f"Compression {compressor}" - python = CPYTHONS[ind % len(CPYTHONS)] - display_name = get_variant_name(base_name, host, python=python, **expansions) - variant = create_variant( - task_names[compressor], - display_name, - python=python, - host=host, - expansions=expansions, - ) - variants.append(variant) - - other_pythons = PYPYS + CPYTHONS[ind:] - for compressor, python in zip_cycle(["snappy", "zlib", "zstd"], other_pythons): - expansions = dict(COMPRESSORS=compressor) - handle_c_ext(c_ext, expansions) - base_name = f"Compression {compressor}" - display_name = get_variant_name(base_name, host, python=python, **expansions) - variant = create_variant( - task_names[compressor], - display_name, - python=python, - host=host, - expansions=expansions, + for compressor in "snappy", "zlib", "zstd": + expansions = dict(COMPRESSOR=compressor) + tasks = base_task if compressor != "zstd" else f"{base_task} !.4.0" + display_name = get_variant_name(f"Compression {compressor}", host) + variants.append( + create_variant( + tasks, + display_name, + host=host, + expansions=expansions, + ) ) - variants.append(variant) - return variants @@ -859,6 +839,23 @@ def create_load_balancer_tasks(): return tasks +def create_compression_tasks(): + tasks = [] + versions = get_versions_from("4.0") + tags = ["compression"] + for python, c_ext, version in product([*MIN_MAX_PYTHON, PYPYS[-1]], C_EXTS, versions): + expansions = dict() + if python != PYPYS[-1]: + handle_c_ext(c_ext, expansions) + elif c_ext == C_EXTS[1]: + continue + name = get_task_name("test-compression", python=python, version=version, **expansions) + server_func = FunctionCall(func="run server", vars=dict(VERSION=version)) + test_func = FunctionCall(func="run tests") + tasks.append(EvgTask(name=name, tags=tags, commands=[server_func, test_func])) + return tasks + + def create_kms_tasks(): tasks = [] for kms_type in ["gcp", "azure"]: From 5435b412e2ef6938d79f070485b7faeab10aba48 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Wed, 2 Apr 2025 10:22:55 -0500 Subject: [PATCH 2/8] fix tag handling --- .evergreen/generated_configs/tasks.yml | 1205 ++++++++++++++++++++++-- .evergreen/scripts/generate_config.py | 1 + 2 files changed, 1141 insertions(+), 65 deletions(-) diff --git a/.evergreen/generated_configs/tasks.yml b/.evergreen/generated_configs/tasks.yml index 5cda2f17a0..abfe9c5428 100644 --- a/.evergreen/generated_configs/tasks.yml +++ b/.evergreen/generated_configs/tasks.yml @@ -720,315 +720,1390 @@ tasks: vars: VERSION: "4.0" - func: run tests - tags: [compression] + tags: [compression, "4.0"] - name: test-compression-v4.2-python3.9-no-c commands: - func: run server vars: VERSION: "4.2" - func: run tests - tags: [compression] + tags: [compression, "4.0", "4.2"] - name: test-compression-v4.4-python3.9-no-c commands: - func: run server vars: VERSION: "4.4" - func: run tests - tags: [compression] + tags: + - compression + - "4.0" + - "4.2" + - "4.4" - name: test-compression-v5.0-python3.9-no-c commands: - func: run server vars: VERSION: "5.0" - func: run tests - tags: [compression] + tags: + - compression + - "4.0" + - "4.2" + - "4.4" + - "5.0" - name: test-compression-v6.0-python3.9-no-c commands: - func: run server vars: VERSION: "6.0" - func: run tests - tags: [compression] + tags: + - compression + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" - name: test-compression-v7.0-python3.9-no-c commands: - func: run server vars: VERSION: "7.0" - func: run tests - tags: [compression] + tags: + - compression + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" - name: test-compression-v8.0-python3.9-no-c commands: - func: run server vars: VERSION: "8.0" - func: run tests - tags: [compression] + tags: + - compression + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" - name: test-compression-rapid-python3.9-no-c commands: - func: run server vars: VERSION: rapid - func: run tests - tags: [compression] + tags: + - compression + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid - name: test-compression-latest-python3.9-no-c commands: - func: run server vars: VERSION: latest - func: run tests - tags: [compression] + tags: + - compression + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest - name: test-compression-v4.0-python3.9 commands: - func: run server vars: VERSION: "4.0" - func: run tests - tags: [compression] + tags: + - compression + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" - name: test-compression-v4.2-python3.9 commands: - func: run server vars: VERSION: "4.2" - func: run tests - tags: [compression] + tags: + - compression + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" - name: test-compression-v4.4-python3.9 commands: - func: run server vars: VERSION: "4.4" - func: run tests - tags: [compression] + tags: + - compression + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - "4.4" - name: test-compression-v5.0-python3.9 commands: - func: run server vars: VERSION: "5.0" - func: run tests - tags: [compression] + tags: + - compression + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - "4.4" + - "5.0" - name: test-compression-v6.0-python3.9 commands: - func: run server vars: VERSION: "6.0" - func: run tests - tags: [compression] + tags: + - compression + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" - name: test-compression-v7.0-python3.9 commands: - func: run server vars: VERSION: "7.0" - func: run tests - tags: [compression] + tags: + - compression + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" - name: test-compression-v8.0-python3.9 commands: - func: run server vars: VERSION: "8.0" - func: run tests - tags: [compression] + tags: + - compression + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" - name: test-compression-rapid-python3.9 commands: - func: run server vars: VERSION: rapid - func: run tests - tags: [compression] + tags: + - compression + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid - name: test-compression-latest-python3.9 commands: - func: run server vars: VERSION: latest - func: run tests - tags: [compression] + tags: + - compression + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest - name: test-compression-v4.0-python3.13-no-c commands: - func: run server vars: VERSION: "4.0" - func: run tests - tags: [compression] + tags: + - compression + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" - name: test-compression-v4.2-python3.13-no-c commands: - func: run server vars: VERSION: "4.2" - func: run tests - tags: [compression] + tags: + - compression + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" - name: test-compression-v4.4-python3.13-no-c commands: - func: run server vars: VERSION: "4.4" - func: run tests - tags: [compression] + tags: + - compression + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - "4.4" - name: test-compression-v5.0-python3.13-no-c commands: - func: run server vars: VERSION: "5.0" - func: run tests - tags: [compression] - - name: test-compression-v6.0-python3.13-no-c - commands: - - func: run server - vars: - VERSION: "6.0" - - func: run tests - tags: [compression] - - name: test-compression-v7.0-python3.13-no-c - commands: - - func: run server + tags: + - compression + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - name: test-compression-v6.0-python3.13-no-c + commands: + - func: run server + vars: + VERSION: "6.0" + - func: run tests + tags: + - compression + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - name: test-compression-v7.0-python3.13-no-c + commands: + - func: run server vars: VERSION: "7.0" - func: run tests - tags: [compression] + tags: + - compression + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" - name: test-compression-v8.0-python3.13-no-c commands: - func: run server vars: VERSION: "8.0" - func: run tests - tags: [compression] + tags: + - compression + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" - name: test-compression-rapid-python3.13-no-c commands: - func: run server vars: VERSION: rapid - func: run tests - tags: [compression] + tags: + - compression + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid - name: test-compression-latest-python3.13-no-c commands: - func: run server vars: VERSION: latest - func: run tests - tags: [compression] + tags: + - compression + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest - name: test-compression-v4.0-python3.13 commands: - func: run server vars: VERSION: "4.0" - func: run tests - tags: [compression] + tags: + - compression + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" - name: test-compression-v4.2-python3.13 commands: - func: run server vars: VERSION: "4.2" - func: run tests - tags: [compression] + tags: + - compression + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" - name: test-compression-v4.4-python3.13 commands: - func: run server vars: VERSION: "4.4" - func: run tests - tags: [compression] + tags: + - compression + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - "4.4" - name: test-compression-v5.0-python3.13 commands: - func: run server vars: VERSION: "5.0" - func: run tests - tags: [compression] - - name: test-compression-v6.0-python3.13 - commands: - - func: run server - vars: + tags: + - compression + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - name: test-compression-v6.0-python3.13 + commands: + - func: run server + vars: VERSION: "6.0" - func: run tests - tags: [compression] + tags: + - compression + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" - name: test-compression-v7.0-python3.13 commands: - func: run server vars: VERSION: "7.0" - func: run tests - tags: [compression] + tags: + - compression + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" - name: test-compression-v8.0-python3.13 commands: - func: run server vars: VERSION: "8.0" - func: run tests - tags: [compression] + tags: + - compression + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" - name: test-compression-rapid-python3.13 commands: - func: run server vars: VERSION: rapid - func: run tests - tags: [compression] + tags: + - compression + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid - name: test-compression-latest-python3.13 commands: - func: run server vars: VERSION: latest - func: run tests - tags: [compression] + tags: + - compression + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest - name: test-compression-v4.0-pypy3.10 commands: - func: run server vars: VERSION: "4.0" - func: run tests - tags: [compression] + tags: + - compression + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" - name: test-compression-v4.2-pypy3.10 commands: - func: run server vars: VERSION: "4.2" - func: run tests - tags: [compression] - - name: test-compression-v4.4-pypy3.10 - commands: - - func: run server - vars: - VERSION: "4.4" - - func: run tests - tags: [compression] - - name: test-compression-v5.0-pypy3.10 + tags: + - compression + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - name: test-compression-v4.4-pypy3.10 + commands: + - func: run server + vars: + VERSION: "4.4" + - func: run tests + tags: + - compression + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - "4.4" + - name: test-compression-v5.0-pypy3.10 commands: - func: run server vars: VERSION: "5.0" - func: run tests - tags: [compression] + tags: + - compression + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - "4.4" + - "5.0" - name: test-compression-v6.0-pypy3.10 commands: - func: run server vars: VERSION: "6.0" - func: run tests - tags: [compression] + tags: + - compression + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" - name: test-compression-v7.0-pypy3.10 commands: - func: run server vars: VERSION: "7.0" - func: run tests - tags: [compression] + tags: + - compression + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" - name: test-compression-v8.0-pypy3.10 commands: - func: run server vars: VERSION: "8.0" - func: run tests - tags: [compression] + tags: + - compression + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" - name: test-compression-rapid-pypy3.10 commands: - func: run server vars: VERSION: rapid - func: run tests - tags: [compression] + tags: + - compression + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid - name: test-compression-latest-pypy3.10 commands: - func: run server vars: VERSION: latest - func: run tests - tags: [compression] + tags: + - compression + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest + - "4.0" + - "4.2" + - "4.4" + - "5.0" + - "6.0" + - "7.0" + - "8.0" + - rapid + - latest # Doctest tests - name: test-doctests diff --git a/.evergreen/scripts/generate_config.py b/.evergreen/scripts/generate_config.py index d78a404f5a..0fafbf15eb 100644 --- a/.evergreen/scripts/generate_config.py +++ b/.evergreen/scripts/generate_config.py @@ -844,6 +844,7 @@ def create_compression_tasks(): versions = get_versions_from("4.0") tags = ["compression"] for python, c_ext, version in product([*MIN_MAX_PYTHON, PYPYS[-1]], C_EXTS, versions): + tags.append(version) expansions = dict() if python != PYPYS[-1]: handle_c_ext(c_ext, expansions) From 9bb69449f25ca995d7c60d63c280a848c635320d Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Wed, 2 Apr 2025 10:24:00 -0500 Subject: [PATCH 3/8] fix tag handling --- .evergreen/generated_configs/variants.yml | 45 ++--------------------- .evergreen/scripts/generate_config.py | 2 +- 2 files changed, 4 insertions(+), 43 deletions(-) diff --git a/.evergreen/generated_configs/variants.yml b/.evergreen/generated_configs/variants.yml index fa0ce9df72..7082dda44d 100644 --- a/.evergreen/generated_configs/variants.yml +++ b/.evergreen/generated_configs/variants.yml @@ -162,18 +162,7 @@ buildvariants: # Compression tests - name: compression-snappy-rhel8 tasks: - - name: . - - name: c - - name: o - - name: m - - name: p - - name: r - - name: e - - name: s - - name: s - - name: i - - name: o - - name: n + - name: .compression display_name: Compression snappy RHEL8 run_on: - rhel87-small @@ -181,18 +170,7 @@ buildvariants: COMPRESSOR: snappy - name: compression-zlib-rhel8 tasks: - - name: . - - name: c - - name: o - - name: m - - name: p - - name: r - - name: e - - name: s - - name: s - - name: i - - name: o - - name: n + - name: .compression display_name: Compression zlib RHEL8 run_on: - rhel87-small @@ -200,24 +178,7 @@ buildvariants: COMPRESSOR: zlib - name: compression-zstd-rhel8 tasks: - - name: . - - name: c - - name: o - - name: m - - name: p - - name: r - - name: e - - name: s - - name: s - - name: i - - name: o - - name: n - - name: " " - - name: "!" - - name: . - - name: "4" - - name: . - - name: "0" + - name: .compression !.4.0 display_name: Compression zstd RHEL8 run_on: - rhel87-small diff --git a/.evergreen/scripts/generate_config.py b/.evergreen/scripts/generate_config.py index 0fafbf15eb..6ab5c2f609 100644 --- a/.evergreen/scripts/generate_config.py +++ b/.evergreen/scripts/generate_config.py @@ -429,7 +429,7 @@ def create_compression_variants(): variants = [] for compressor in "snappy", "zlib", "zstd": expansions = dict(COMPRESSOR=compressor) - tasks = base_task if compressor != "zstd" else f"{base_task} !.4.0" + tasks = [base_task] if compressor != "zstd" else [f"{base_task} !.4.0"] display_name = get_variant_name(f"Compression {compressor}", host) variants.append( create_variant( From 91b4f2f981296f953962c230572696a8c8fef075 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Wed, 2 Apr 2025 10:24:52 -0500 Subject: [PATCH 4/8] fix tag handling --- .evergreen/generated_configs/tasks.yml | 1163 +----------------------- .evergreen/scripts/generate_config.py | 3 +- 2 files changed, 45 insertions(+), 1121 deletions(-) diff --git a/.evergreen/generated_configs/tasks.yml b/.evergreen/generated_configs/tasks.yml index abfe9c5428..6b5f3d771d 100644 --- a/.evergreen/generated_configs/tasks.yml +++ b/.evergreen/generated_configs/tasks.yml @@ -727,1383 +727,308 @@ tasks: vars: VERSION: "4.2" - func: run tests - tags: [compression, "4.0", "4.2"] + tags: [compression, "4.2"] - name: test-compression-v4.4-python3.9-no-c commands: - func: run server vars: VERSION: "4.4" - func: run tests - tags: - - compression - - "4.0" - - "4.2" - - "4.4" + tags: [compression, "4.4"] - name: test-compression-v5.0-python3.9-no-c commands: - func: run server vars: VERSION: "5.0" - func: run tests - tags: - - compression - - "4.0" - - "4.2" - - "4.4" - - "5.0" + tags: [compression, "5.0"] - name: test-compression-v6.0-python3.9-no-c commands: - func: run server vars: VERSION: "6.0" - func: run tests - tags: - - compression - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" + tags: [compression, "6.0"] - name: test-compression-v7.0-python3.9-no-c commands: - func: run server vars: VERSION: "7.0" - func: run tests - tags: - - compression - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" + tags: [compression, "7.0"] - name: test-compression-v8.0-python3.9-no-c commands: - func: run server vars: VERSION: "8.0" - func: run tests - tags: - - compression - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" + tags: [compression, "8.0"] - name: test-compression-rapid-python3.9-no-c commands: - func: run server vars: VERSION: rapid - func: run tests - tags: - - compression - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid + tags: [compression, rapid] - name: test-compression-latest-python3.9-no-c commands: - func: run server vars: VERSION: latest - func: run tests - tags: - - compression - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest + tags: [compression, latest] - name: test-compression-v4.0-python3.9 commands: - func: run server vars: VERSION: "4.0" - func: run tests - tags: - - compression - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" + tags: [compression, "4.0"] - name: test-compression-v4.2-python3.9 commands: - func: run server vars: VERSION: "4.2" - func: run tests - tags: - - compression - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" + tags: [compression, "4.2"] - name: test-compression-v4.4-python3.9 commands: - func: run server vars: VERSION: "4.4" - func: run tests - tags: - - compression - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" - - "4.4" + tags: [compression, "4.4"] - name: test-compression-v5.0-python3.9 commands: - func: run server vars: VERSION: "5.0" - func: run tests - tags: - - compression - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" - - "4.4" - - "5.0" + tags: [compression, "5.0"] - name: test-compression-v6.0-python3.9 commands: - func: run server vars: VERSION: "6.0" - func: run tests - tags: - - compression - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" + tags: [compression, "6.0"] - name: test-compression-v7.0-python3.9 commands: - func: run server vars: VERSION: "7.0" - func: run tests - tags: - - compression - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" + tags: [compression, "7.0"] - name: test-compression-v8.0-python3.9 commands: - func: run server vars: VERSION: "8.0" - func: run tests - tags: - - compression - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" + tags: [compression, "8.0"] - name: test-compression-rapid-python3.9 commands: - func: run server vars: VERSION: rapid - func: run tests - tags: - - compression - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid + tags: [compression, rapid] - name: test-compression-latest-python3.9 commands: - func: run server vars: VERSION: latest - func: run tests - tags: - - compression - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest + tags: [compression, latest] - name: test-compression-v4.0-python3.13-no-c commands: - func: run server vars: VERSION: "4.0" - func: run tests - tags: - - compression - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" + tags: [compression, "4.0"] - name: test-compression-v4.2-python3.13-no-c commands: - func: run server vars: VERSION: "4.2" - func: run tests - tags: - - compression - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" + tags: [compression, "4.2"] - name: test-compression-v4.4-python3.13-no-c commands: - func: run server vars: VERSION: "4.4" - func: run tests - tags: - - compression - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" - - "4.4" + tags: [compression, "4.4"] - name: test-compression-v5.0-python3.13-no-c commands: - func: run server vars: VERSION: "5.0" - func: run tests - tags: - - compression - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" - - "4.4" - - "5.0" + tags: [compression, "5.0"] - name: test-compression-v6.0-python3.13-no-c commands: - func: run server vars: VERSION: "6.0" - func: run tests - tags: - - compression - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" + tags: [compression, "6.0"] - name: test-compression-v7.0-python3.13-no-c commands: - func: run server vars: VERSION: "7.0" - func: run tests - tags: - - compression - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" + tags: [compression, "7.0"] - name: test-compression-v8.0-python3.13-no-c commands: - func: run server vars: VERSION: "8.0" - func: run tests - tags: - - compression - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" + tags: [compression, "8.0"] - name: test-compression-rapid-python3.13-no-c commands: - func: run server vars: VERSION: rapid - func: run tests - tags: - - compression - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid + tags: [compression, rapid] - name: test-compression-latest-python3.13-no-c commands: - func: run server vars: VERSION: latest - func: run tests - tags: - - compression - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest + tags: [compression, latest] - name: test-compression-v4.0-python3.13 commands: - func: run server vars: VERSION: "4.0" - func: run tests - tags: - - compression - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" + tags: [compression, "4.0"] - name: test-compression-v4.2-python3.13 commands: - func: run server vars: VERSION: "4.2" - func: run tests - tags: - - compression - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" + tags: [compression, "4.2"] - name: test-compression-v4.4-python3.13 commands: - func: run server vars: VERSION: "4.4" - func: run tests - tags: - - compression - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" - - "4.4" + tags: [compression, "4.4"] - name: test-compression-v5.0-python3.13 commands: - func: run server vars: VERSION: "5.0" - func: run tests - tags: - - compression - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" - - "4.4" - - "5.0" + tags: [compression, "5.0"] - name: test-compression-v6.0-python3.13 commands: - func: run server vars: VERSION: "6.0" - func: run tests - tags: - - compression - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" + tags: [compression, "6.0"] - name: test-compression-v7.0-python3.13 commands: - func: run server vars: VERSION: "7.0" - func: run tests - tags: - - compression - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" + tags: [compression, "7.0"] - name: test-compression-v8.0-python3.13 commands: - func: run server vars: VERSION: "8.0" - func: run tests - tags: - - compression - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" + tags: [compression, "8.0"] - name: test-compression-rapid-python3.13 commands: - func: run server vars: VERSION: rapid - func: run tests - tags: - - compression - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid + tags: [compression, rapid] - name: test-compression-latest-python3.13 commands: - func: run server vars: VERSION: latest - func: run tests - tags: - - compression - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest + tags: [compression, latest] - name: test-compression-v4.0-pypy3.10 commands: - func: run server vars: VERSION: "4.0" - func: run tests - tags: - - compression - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" + tags: [compression, "4.0"] - name: test-compression-v4.2-pypy3.10 commands: - func: run server vars: VERSION: "4.2" - func: run tests - tags: - - compression - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" + tags: [compression, "4.2"] - name: test-compression-v4.4-pypy3.10 commands: - func: run server vars: VERSION: "4.4" - func: run tests - tags: - - compression - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" - - "4.4" + tags: [compression, "4.4"] - name: test-compression-v5.0-pypy3.10 commands: - func: run server vars: VERSION: "5.0" - func: run tests - tags: - - compression - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" - - "4.4" - - "5.0" + tags: [compression, "5.0"] - name: test-compression-v6.0-pypy3.10 commands: - func: run server vars: VERSION: "6.0" - func: run tests - tags: - - compression - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" + tags: [compression, "6.0"] - name: test-compression-v7.0-pypy3.10 commands: - func: run server vars: VERSION: "7.0" - func: run tests - tags: - - compression - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" + tags: [compression, "7.0"] - name: test-compression-v8.0-pypy3.10 commands: - func: run server vars: VERSION: "8.0" - func: run tests - tags: - - compression - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" + tags: [compression, "8.0"] - name: test-compression-rapid-pypy3.10 commands: - func: run server vars: VERSION: rapid - func: run tests - tags: - - compression - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid + tags: [compression, rapid] - name: test-compression-latest-pypy3.10 commands: - func: run server vars: VERSION: latest - func: run tests - tags: - - compression - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest - - "4.0" - - "4.2" - - "4.4" - - "5.0" - - "6.0" - - "7.0" - - "8.0" - - rapid - - latest + tags: [compression, latest] # Doctest tests - name: test-doctests diff --git a/.evergreen/scripts/generate_config.py b/.evergreen/scripts/generate_config.py index 6ab5c2f609..9409c4fb76 100644 --- a/.evergreen/scripts/generate_config.py +++ b/.evergreen/scripts/generate_config.py @@ -842,9 +842,8 @@ def create_load_balancer_tasks(): def create_compression_tasks(): tasks = [] versions = get_versions_from("4.0") - tags = ["compression"] for python, c_ext, version in product([*MIN_MAX_PYTHON, PYPYS[-1]], C_EXTS, versions): - tags.append(version) + tags = ["compression", version] expansions = dict() if python != PYPYS[-1]: handle_c_ext(c_ext, expansions) From 4364b645f7a1b26bcdeacd67d34013ad0cb0ac32 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Wed, 2 Apr 2025 10:28:57 -0500 Subject: [PATCH 5/8] clean up tasks --- .evergreen/generated_configs/tasks.yml | 243 +------------------------ .evergreen/scripts/generate_config.py | 13 +- 2 files changed, 18 insertions(+), 238 deletions(-) diff --git a/.evergreen/generated_configs/tasks.yml b/.evergreen/generated_configs/tasks.yml index 6b5f3d771d..6e5dbc5f86 100644 --- a/.evergreen/generated_configs/tasks.yml +++ b/.evergreen/generated_configs/tasks.yml @@ -714,195 +714,6 @@ tasks: tags: [auth-aws, auth-aws-web-identity] # Compression tests - - name: test-compression-v4.0-python3.9-no-c - commands: - - func: run server - vars: - VERSION: "4.0" - - func: run tests - tags: [compression, "4.0"] - - name: test-compression-v4.2-python3.9-no-c - commands: - - func: run server - vars: - VERSION: "4.2" - - func: run tests - tags: [compression, "4.2"] - - name: test-compression-v4.4-python3.9-no-c - commands: - - func: run server - vars: - VERSION: "4.4" - - func: run tests - tags: [compression, "4.4"] - - name: test-compression-v5.0-python3.9-no-c - commands: - - func: run server - vars: - VERSION: "5.0" - - func: run tests - tags: [compression, "5.0"] - - name: test-compression-v6.0-python3.9-no-c - commands: - - func: run server - vars: - VERSION: "6.0" - - func: run tests - tags: [compression, "6.0"] - - name: test-compression-v7.0-python3.9-no-c - commands: - - func: run server - vars: - VERSION: "7.0" - - func: run tests - tags: [compression, "7.0"] - - name: test-compression-v8.0-python3.9-no-c - commands: - - func: run server - vars: - VERSION: "8.0" - - func: run tests - tags: [compression, "8.0"] - - name: test-compression-rapid-python3.9-no-c - commands: - - func: run server - vars: - VERSION: rapid - - func: run tests - tags: [compression, rapid] - - name: test-compression-latest-python3.9-no-c - commands: - - func: run server - vars: - VERSION: latest - - func: run tests - tags: [compression, latest] - - name: test-compression-v4.0-python3.9 - commands: - - func: run server - vars: - VERSION: "4.0" - - func: run tests - tags: [compression, "4.0"] - - name: test-compression-v4.2-python3.9 - commands: - - func: run server - vars: - VERSION: "4.2" - - func: run tests - tags: [compression, "4.2"] - - name: test-compression-v4.4-python3.9 - commands: - - func: run server - vars: - VERSION: "4.4" - - func: run tests - tags: [compression, "4.4"] - - name: test-compression-v5.0-python3.9 - commands: - - func: run server - vars: - VERSION: "5.0" - - func: run tests - tags: [compression, "5.0"] - - name: test-compression-v6.0-python3.9 - commands: - - func: run server - vars: - VERSION: "6.0" - - func: run tests - tags: [compression, "6.0"] - - name: test-compression-v7.0-python3.9 - commands: - - func: run server - vars: - VERSION: "7.0" - - func: run tests - tags: [compression, "7.0"] - - name: test-compression-v8.0-python3.9 - commands: - - func: run server - vars: - VERSION: "8.0" - - func: run tests - tags: [compression, "8.0"] - - name: test-compression-rapid-python3.9 - commands: - - func: run server - vars: - VERSION: rapid - - func: run tests - tags: [compression, rapid] - - name: test-compression-latest-python3.9 - commands: - - func: run server - vars: - VERSION: latest - - func: run tests - tags: [compression, latest] - - name: test-compression-v4.0-python3.13-no-c - commands: - - func: run server - vars: - VERSION: "4.0" - - func: run tests - tags: [compression, "4.0"] - - name: test-compression-v4.2-python3.13-no-c - commands: - - func: run server - vars: - VERSION: "4.2" - - func: run tests - tags: [compression, "4.2"] - - name: test-compression-v4.4-python3.13-no-c - commands: - - func: run server - vars: - VERSION: "4.4" - - func: run tests - tags: [compression, "4.4"] - - name: test-compression-v5.0-python3.13-no-c - commands: - - func: run server - vars: - VERSION: "5.0" - - func: run tests - tags: [compression, "5.0"] - - name: test-compression-v6.0-python3.13-no-c - commands: - - func: run server - vars: - VERSION: "6.0" - - func: run tests - tags: [compression, "6.0"] - - name: test-compression-v7.0-python3.13-no-c - commands: - - func: run server - vars: - VERSION: "7.0" - - func: run tests - tags: [compression, "7.0"] - - name: test-compression-v8.0-python3.13-no-c - commands: - - func: run server - vars: - VERSION: "8.0" - - func: run tests - tags: [compression, "8.0"] - - name: test-compression-rapid-python3.13-no-c - commands: - - func: run server - vars: - VERSION: rapid - - func: run tests - tags: [compression, rapid] - - name: test-compression-latest-python3.13-no-c - commands: - - func: run server - vars: - VERSION: latest - - func: run tests - tags: [compression, latest] - name: test-compression-v4.0-python3.13 commands: - func: run server @@ -966,62 +777,20 @@ tasks: VERSION: latest - func: run tests tags: [compression, latest] - - name: test-compression-v4.0-pypy3.10 - commands: - - func: run server - vars: - VERSION: "4.0" - - func: run tests - tags: [compression, "4.0"] - - name: test-compression-v4.2-pypy3.10 - commands: - - func: run server - vars: - VERSION: "4.2" - - func: run tests - tags: [compression, "4.2"] - - name: test-compression-v4.4-pypy3.10 - commands: - - func: run server - vars: - VERSION: "4.4" - - func: run tests - tags: [compression, "4.4"] - - name: test-compression-v5.0-pypy3.10 - commands: - - func: run server - vars: - VERSION: "5.0" - - func: run tests - tags: [compression, "5.0"] - - name: test-compression-v6.0-pypy3.10 - commands: - - func: run server - vars: - VERSION: "6.0" - - func: run tests - tags: [compression, "6.0"] - - name: test-compression-v7.0-pypy3.10 - commands: - - func: run server - vars: - VERSION: "7.0" - - func: run tests - tags: [compression, "7.0"] - - name: test-compression-v8.0-pypy3.10 + - name: test-compression-latest-python3.13-no-c commands: - func: run server vars: - VERSION: "8.0" + VERSION: latest - func: run tests - tags: [compression, "8.0"] - - name: test-compression-rapid-pypy3.10 + tags: [compression, latest] + - name: test-compression-latest-python3.13 commands: - func: run server vars: - VERSION: rapid + VERSION: latest - func: run tests - tags: [compression, rapid] + tags: [compression, latest] - name: test-compression-latest-pypy3.10 commands: - func: run server diff --git a/.evergreen/scripts/generate_config.py b/.evergreen/scripts/generate_config.py index 9409c4fb76..d75b139403 100644 --- a/.evergreen/scripts/generate_config.py +++ b/.evergreen/scripts/generate_config.py @@ -842,7 +842,18 @@ def create_load_balancer_tasks(): def create_compression_tasks(): tasks = [] versions = get_versions_from("4.0") - for python, c_ext, version in product([*MIN_MAX_PYTHON, PYPYS[-1]], C_EXTS, versions): + # Test all server versions with min python. + for version in versions: + python = CPYTHONS[-1] + tags = ["compression", version] + name = get_task_name("test-compression", python=python, version=version) + server_func = FunctionCall(func="run server", vars=dict(VERSION=version)) + test_func = FunctionCall(func="run tests") + tasks.append(EvgTask(name=name, tags=tags, commands=[server_func, test_func])) + + # Test latest with other variants. + for python, c_ext in product([CPYTHONS[-1], PYPYS[-1]], C_EXTS): + version = "latest" tags = ["compression", version] expansions = dict() if python != PYPYS[-1]: From 69ea195352e5bed59cc0e956f6037ac249f5dda9 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Wed, 2 Apr 2025 10:29:32 -0500 Subject: [PATCH 6/8] clean up tasks --- .evergreen/generated_configs/tasks.yml | 18 +++++++++--------- .evergreen/scripts/generate_config.py | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.evergreen/generated_configs/tasks.yml b/.evergreen/generated_configs/tasks.yml index 6e5dbc5f86..224ad746c8 100644 --- a/.evergreen/generated_configs/tasks.yml +++ b/.evergreen/generated_configs/tasks.yml @@ -714,63 +714,63 @@ tasks: tags: [auth-aws, auth-aws-web-identity] # Compression tests - - name: test-compression-v4.0-python3.13 + - name: test-compression-v4.0-python3.9 commands: - func: run server vars: VERSION: "4.0" - func: run tests tags: [compression, "4.0"] - - name: test-compression-v4.2-python3.13 + - name: test-compression-v4.2-python3.9 commands: - func: run server vars: VERSION: "4.2" - func: run tests tags: [compression, "4.2"] - - name: test-compression-v4.4-python3.13 + - name: test-compression-v4.4-python3.9 commands: - func: run server vars: VERSION: "4.4" - func: run tests tags: [compression, "4.4"] - - name: test-compression-v5.0-python3.13 + - name: test-compression-v5.0-python3.9 commands: - func: run server vars: VERSION: "5.0" - func: run tests tags: [compression, "5.0"] - - name: test-compression-v6.0-python3.13 + - name: test-compression-v6.0-python3.9 commands: - func: run server vars: VERSION: "6.0" - func: run tests tags: [compression, "6.0"] - - name: test-compression-v7.0-python3.13 + - name: test-compression-v7.0-python3.9 commands: - func: run server vars: VERSION: "7.0" - func: run tests tags: [compression, "7.0"] - - name: test-compression-v8.0-python3.13 + - name: test-compression-v8.0-python3.9 commands: - func: run server vars: VERSION: "8.0" - func: run tests tags: [compression, "8.0"] - - name: test-compression-rapid-python3.13 + - name: test-compression-rapid-python3.9 commands: - func: run server vars: VERSION: rapid - func: run tests tags: [compression, rapid] - - name: test-compression-latest-python3.13 + - name: test-compression-latest-python3.9 commands: - func: run server vars: diff --git a/.evergreen/scripts/generate_config.py b/.evergreen/scripts/generate_config.py index d75b139403..09965671a2 100644 --- a/.evergreen/scripts/generate_config.py +++ b/.evergreen/scripts/generate_config.py @@ -844,7 +844,7 @@ def create_compression_tasks(): versions = get_versions_from("4.0") # Test all server versions with min python. for version in versions: - python = CPYTHONS[-1] + python = CPYTHONS[0] tags = ["compression", version] name = get_task_name("test-compression", python=python, version=version) server_func = FunctionCall(func="run server", vars=dict(VERSION=version)) From 6513aa0adda9879e3f3399fbabc9bda48da253d7 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Wed, 2 Apr 2025 10:32:05 -0500 Subject: [PATCH 7/8] clean up tasks --- .evergreen/generated_configs/tasks.yml | 7 +++++++ .evergreen/scripts/generate_config.py | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.evergreen/generated_configs/tasks.yml b/.evergreen/generated_configs/tasks.yml index 224ad746c8..531f4efaa0 100644 --- a/.evergreen/generated_configs/tasks.yml +++ b/.evergreen/generated_configs/tasks.yml @@ -777,6 +777,13 @@ tasks: VERSION: latest - func: run tests tags: [compression, latest] + - name: test-compression-latest-python3.9-no-c + commands: + - func: run server + vars: + VERSION: latest + - func: run tests + tags: [compression, latest] - name: test-compression-latest-python3.13-no-c commands: - func: run server diff --git a/.evergreen/scripts/generate_config.py b/.evergreen/scripts/generate_config.py index 09965671a2..a97bff6d81 100644 --- a/.evergreen/scripts/generate_config.py +++ b/.evergreen/scripts/generate_config.py @@ -852,14 +852,14 @@ def create_compression_tasks(): tasks.append(EvgTask(name=name, tags=tags, commands=[server_func, test_func])) # Test latest with other variants. - for python, c_ext in product([CPYTHONS[-1], PYPYS[-1]], C_EXTS): + for python, c_ext in product([*MIN_MAX_PYTHON, PYPYS[-1]], C_EXTS): version = "latest" tags = ["compression", version] expansions = dict() + if python in [CPYTHONS[0], PYPYS[-1]] and c_ext == C_EXTS[1]: + continue if python != PYPYS[-1]: handle_c_ext(c_ext, expansions) - elif c_ext == C_EXTS[1]: - continue name = get_task_name("test-compression", python=python, version=version, **expansions) server_func = FunctionCall(func="run server", vars=dict(VERSION=version)) test_func = FunctionCall(func="run tests") From b43ed8b7f67158b15328c882bbebd580d37ccfb2 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Wed, 2 Apr 2025 10:36:48 -0500 Subject: [PATCH 8/8] clean up tasks --- .evergreen/generated_configs/tasks.yml | 10 +++------- .evergreen/scripts/generate_config.py | 23 ++++++++++++++--------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/.evergreen/generated_configs/tasks.yml b/.evergreen/generated_configs/tasks.yml index 531f4efaa0..fa3c278fa8 100644 --- a/.evergreen/generated_configs/tasks.yml +++ b/.evergreen/generated_configs/tasks.yml @@ -777,19 +777,14 @@ tasks: VERSION: latest - func: run tests tags: [compression, latest] - - name: test-compression-latest-python3.9-no-c - commands: - - func: run server - vars: - VERSION: latest - - func: run tests - tags: [compression, latest] - name: test-compression-latest-python3.13-no-c commands: - func: run server vars: VERSION: latest - func: run tests + vars: + NO_EXT: "1" tags: [compression, latest] - name: test-compression-latest-python3.13 commands: @@ -797,6 +792,7 @@ tasks: vars: VERSION: latest - func: run tests + vars: {} tags: [compression, latest] - name: test-compression-latest-pypy3.10 commands: diff --git a/.evergreen/scripts/generate_config.py b/.evergreen/scripts/generate_config.py index a97bff6d81..07af9d59d8 100644 --- a/.evergreen/scripts/generate_config.py +++ b/.evergreen/scripts/generate_config.py @@ -851,19 +851,24 @@ def create_compression_tasks(): test_func = FunctionCall(func="run tests") tasks.append(EvgTask(name=name, tags=tags, commands=[server_func, test_func])) - # Test latest with other variants. - for python, c_ext in product([*MIN_MAX_PYTHON, PYPYS[-1]], C_EXTS): - version = "latest" - tags = ["compression", version] + # Test latest with max python, with and without c exts. + version = "latest" + tags = ["compression", "latest"] + for c_ext in C_EXTS: + python = CPYTHONS[-1] expansions = dict() - if python in [CPYTHONS[0], PYPYS[-1]] and c_ext == C_EXTS[1]: - continue - if python != PYPYS[-1]: - handle_c_ext(c_ext, expansions) + handle_c_ext(c_ext, expansions) name = get_task_name("test-compression", python=python, version=version, **expansions) server_func = FunctionCall(func="run server", vars=dict(VERSION=version)) - test_func = FunctionCall(func="run tests") + test_func = FunctionCall(func="run tests", vars=expansions) tasks.append(EvgTask(name=name, tags=tags, commands=[server_func, test_func])) + + # Test on latest with pypy. + python = PYPYS[-1] + name = get_task_name("test-compression", python=python, version=version) + server_func = FunctionCall(func="run server", vars=dict(VERSION=version)) + test_func = FunctionCall(func="run tests") + tasks.append(EvgTask(name=name, tags=tags, commands=[server_func, test_func])) return tasks