Skip to content

Commit

Permalink
clean up matrix
Browse files Browse the repository at this point in the history
  • Loading branch information
@blink1073
blink1073 committed Oct 17, 2024
1 parent 8cef199 commit dde3a2d
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 180 deletions.
189 changes: 12 additions & 177 deletions .evergreen/config.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3119,91 +3119,34 @@ buildvariants:
COMPRESSORS: snappy
NO_EXT: "1"
PYTHON_BINARY: /opt/python/3.9/bin/python3
- name: snappy-compression-rhel8-py3.9
tasks:
- name: .standalone
display_name: snappy compression RHEL8 py3.9
run_on:
- rhel87-small
expansions:
COMPRESSORS: snappy
PYTHON_BINARY: /opt/python/3.9/bin/python3
- name: snappy-compression-rhel8-py3.13-no-c
tasks:
- name: .standalone
display_name: snappy compression RHEL8 py3.13 No C
run_on:
- rhel87-small
expansions:
COMPRESSORS: snappy
NO_EXT: "1"
PYTHON_BINARY: /opt/python/3.13/bin/python3
- name: snappy-compression-rhel8-py3.13
- name: snappy-compression-rhel8-py3.10
tasks:
- name: .standalone
display_name: snappy compression RHEL8 py3.13
display_name: snappy compression RHEL8 py3.10
run_on:
- rhel87-small
expansions:
COMPRESSORS: snappy
PYTHON_BINARY: /opt/python/3.13/bin/python3
- name: zlib-compression-rhel8-py3.9-no-c
tasks:
- name: .standalone
display_name: zlib compression RHEL8 py3.9 No C
run_on:
- rhel87-small
expansions:
COMPRESSORS: zlib
NO_EXT: "1"
PYTHON_BINARY: /opt/python/3.9/bin/python3
- name: zlib-compression-rhel8-py3.9
tasks:
- name: .standalone
display_name: zlib compression RHEL8 py3.9
run_on:
- rhel87-small
expansions:
COMPRESSORS: zlib
PYTHON_BINARY: /opt/python/3.9/bin/python3
- name: zlib-compression-rhel8-py3.13-no-c
PYTHON_BINARY: /opt/python/3.10/bin/python3
- name: zlib-compression-rhel8-py3.11-no-c
tasks:
- name: .standalone
display_name: zlib compression RHEL8 py3.13 No C
display_name: zlib compression RHEL8 py3.11 No C
run_on:
- rhel87-small
expansions:
COMPRESSORS: zlib
NO_EXT: "1"
PYTHON_BINARY: /opt/python/3.13/bin/python3
- name: zlib-compression-rhel8-py3.13
PYTHON_BINARY: /opt/python/3.11/bin/python3
- name: zlib-compression-rhel8-py3.12
tasks:
- name: .standalone
display_name: zlib compression RHEL8 py3.13
display_name: zlib compression RHEL8 py3.12
run_on:
- rhel87-small
expansions:
COMPRESSORS: zlib
PYTHON_BINARY: /opt/python/3.13/bin/python3
- name: zstd-compression-rhel8-py3.9-no-c
tasks:
- name: .standalone !.4.0
display_name: zstd compression RHEL8 py3.9 No C
run_on:
- rhel87-small
expansions:
COMPRESSORS: zstd
NO_EXT: "1"
PYTHON_BINARY: /opt/python/3.9/bin/python3
- name: zstd-compression-rhel8-py3.9
tasks:
- name: .standalone !.4.0
display_name: zstd compression RHEL8 py3.9
run_on:
- rhel87-small
expansions:
COMPRESSORS: zstd
PYTHON_BINARY: /opt/python/3.9/bin/python3
PYTHON_BINARY: /opt/python/3.12/bin/python3
- name: zstd-compression-rhel8-py3.13-no-c
tasks:
- name: .standalone !.4.0
Expand All @@ -3214,42 +3157,15 @@ buildvariants:
COMPRESSORS: zstd
NO_EXT: "1"
PYTHON_BINARY: /opt/python/3.13/bin/python3
- name: zstd-compression-rhel8-py3.13
- name: zstd-compression-rhel8-py3.9
tasks:
- name: .standalone !.4.0
display_name: zstd compression RHEL8 py3.13
display_name: zstd compression RHEL8 py3.9
run_on:
- rhel87-small
expansions:
COMPRESSORS: zstd
PYTHON_BINARY: /opt/python/3.13/bin/python3
- name: snappy-compression-rhel8-py3.10
tasks:
- name: .standalone
display_name: snappy compression RHEL8 py3.10
run_on:
- rhel87-small
expansions:
COMPRESSORS: snappy
PYTHON_BINARY: /opt/python/3.10/bin/python3
- name: snappy-compression-rhel8-py3.11
tasks:
- name: .standalone
display_name: snappy compression RHEL8 py3.11
run_on:
- rhel87-small
expansions:
COMPRESSORS: snappy
PYTHON_BINARY: /opt/python/3.11/bin/python3
- name: snappy-compression-rhel8-py3.12
tasks:
- name: .standalone
display_name: snappy compression RHEL8 py3.12
run_on:
- rhel87-small
expansions:
COMPRESSORS: snappy
PYTHON_BINARY: /opt/python/3.12/bin/python3
PYTHON_BINARY: /opt/python/3.9/bin/python3
- name: snappy-compression-rhel8-pypy3.9
tasks:
- name: .standalone
Expand All @@ -3259,51 +3175,6 @@ buildvariants:
expansions:
COMPRESSORS: snappy
PYTHON_BINARY: /opt/python/pypy3.9/bin/python3
- name: snappy-compression-rhel8-pypy3.10
tasks:
- name: .standalone
display_name: snappy compression RHEL8 pypy3.10
run_on:
- rhel87-small
expansions:
COMPRESSORS: snappy
PYTHON_BINARY: /opt/python/pypy3.10/bin/python3
- name: zlib-compression-rhel8-py3.10
tasks:
- name: .standalone
display_name: zlib compression RHEL8 py3.10
run_on:
- rhel87-small
expansions:
COMPRESSORS: zlib
PYTHON_BINARY: /opt/python/3.10/bin/python3
- name: zlib-compression-rhel8-py3.11
tasks:
- name: .standalone
display_name: zlib compression RHEL8 py3.11
run_on:
- rhel87-small
expansions:
COMPRESSORS: zlib
PYTHON_BINARY: /opt/python/3.11/bin/python3
- name: zlib-compression-rhel8-py3.12
tasks:
- name: .standalone
display_name: zlib compression RHEL8 py3.12
run_on:
- rhel87-small
expansions:
COMPRESSORS: zlib
PYTHON_BINARY: /opt/python/3.12/bin/python3
- name: zlib-compression-rhel8-pypy3.9
tasks:
- name: .standalone
display_name: zlib compression RHEL8 pypy3.9
run_on:
- rhel87-small
expansions:
COMPRESSORS: zlib
PYTHON_BINARY: /opt/python/pypy3.9/bin/python3
- name: zlib-compression-rhel8-pypy3.10
tasks:
- name: .standalone
Expand All @@ -3313,33 +3184,6 @@ buildvariants:
expansions:
COMPRESSORS: zlib
PYTHON_BINARY: /opt/python/pypy3.10/bin/python3
- name: zstd-compression-rhel8-py3.10
tasks:
- name: .standalone !.4.0
display_name: zstd compression RHEL8 py3.10
run_on:
- rhel87-small
expansions:
COMPRESSORS: zstd
PYTHON_BINARY: /opt/python/3.10/bin/python3
- name: zstd-compression-rhel8-py3.11
tasks:
- name: .standalone !.4.0
display_name: zstd compression RHEL8 py3.11
run_on:
- rhel87-small
expansions:
COMPRESSORS: zstd
PYTHON_BINARY: /opt/python/3.11/bin/python3
- name: zstd-compression-rhel8-py3.12
tasks:
- name: .standalone !.4.0
display_name: zstd compression RHEL8 py3.12
run_on:
- rhel87-small
expansions:
COMPRESSORS: zstd
PYTHON_BINARY: /opt/python/3.12/bin/python3
- name: zstd-compression-rhel8-pypy3.9
tasks:
- name: .standalone !.4.0
Expand All @@ -3349,15 +3193,6 @@ buildvariants:
expansions:
COMPRESSORS: zstd
PYTHON_BINARY: /opt/python/pypy3.9/bin/python3
- name: zstd-compression-rhel8-pypy3.10
tasks:
- name: .standalone !.4.0
display_name: zstd compression RHEL8 pypy3.10
run_on:
- rhel87-small
expansions:
COMPRESSORS: zstd
PYTHON_BINARY: /opt/python/pypy3.10/bin/python3

- matrix_name: "tests-fips"
matrix_spec:
Expand Down
7 changes: 4 additions & 3 deletions .evergreen/scripts/generate_config.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -351,10 +351,11 @@ def create_compression_variants():
host = "rhel8"
task_names = dict(snappy=[".standalone"], zlib=[".standalone"], zstd=[".standalone !.4.0"])
variants = []
for compressor, python, c_ext in product(["snappy", "zlib", "zstd"], MIN_MAX_PYTHON, C_EXTS):
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"{compressor} compression"
python = CPYTHONS[ind % len(CPYTHONS)]
display_name = get_display_name(base_name, host, python=python, **expansions)
variant = create_variant(
task_names[compressor],
Expand All @@ -365,8 +366,8 @@ def create_compression_variants():
)
variants.append(variant)

other_pythons = [p for p in CPYTHONS if p not in MIN_MAX_PYTHON] + PYPYS
for compressor, python in product(["snappy", "zlib", "zstd"], other_pythons):
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"{compressor} compression"
Expand Down

0 comments on commit dde3a2d

Please sign in to comment.