Skip to content

Commit dde3a2d

Browse files
blink1073blink1073
committed
clean up matrix
1 parent 8cef199 commit dde3a2d

File tree

2 files changed

+16
-180
lines changed

2 files changed

+16
-180
lines changed

‎.evergreen/config.yml

Lines changed: 12 additions & 177 deletions
Original file line numberDiff line numberDiff line change
@@ -3119,91 +3119,34 @@ buildvariants:
31193119
COMPRESSORS: snappy
31203120
NO_EXT: "1"
31213121
PYTHON_BINARY: /opt/python/3.9/bin/python3
3122-
- name: snappy-compression-rhel8-py3.9
3123-
tasks:
3124-
- name: .standalone
3125-
display_name: snappy compression RHEL8 py3.9
3126-
run_on:
3127-
- rhel87-small
3128-
expansions:
3129-
COMPRESSORS: snappy
3130-
PYTHON_BINARY: /opt/python/3.9/bin/python3
3131-
- name: snappy-compression-rhel8-py3.13-no-c
3132-
tasks:
3133-
- name: .standalone
3134-
display_name: snappy compression RHEL8 py3.13 No C
3135-
run_on:
3136-
- rhel87-small
3137-
expansions:
3138-
COMPRESSORS: snappy
3139-
NO_EXT: "1"
3140-
PYTHON_BINARY: /opt/python/3.13/bin/python3
3141-
- name: snappy-compression-rhel8-py3.13
3122+
- name: snappy-compression-rhel8-py3.10
31423123
tasks:
31433124
- name: .standalone
3144-
display_name: snappy compression RHEL8 py3.13
3125+
display_name: snappy compression RHEL8 py3.10
31453126
run_on:
31463127
- rhel87-small
31473128
expansions:
31483129
COMPRESSORS: snappy
3149-
PYTHON_BINARY: /opt/python/3.13/bin/python3
3150-
- name: zlib-compression-rhel8-py3.9-no-c
3151-
tasks:
3152-
- name: .standalone
3153-
display_name: zlib compression RHEL8 py3.9 No C
3154-
run_on:
3155-
- rhel87-small
3156-
expansions:
3157-
COMPRESSORS: zlib
3158-
NO_EXT: "1"
3159-
PYTHON_BINARY: /opt/python/3.9/bin/python3
3160-
- name: zlib-compression-rhel8-py3.9
3161-
tasks:
3162-
- name: .standalone
3163-
display_name: zlib compression RHEL8 py3.9
3164-
run_on:
3165-
- rhel87-small
3166-
expansions:
3167-
COMPRESSORS: zlib
3168-
PYTHON_BINARY: /opt/python/3.9/bin/python3
3169-
- name: zlib-compression-rhel8-py3.13-no-c
3130+
PYTHON_BINARY: /opt/python/3.10/bin/python3
3131+
- name: zlib-compression-rhel8-py3.11-no-c
31703132
tasks:
31713133
- name: .standalone
3172-
display_name: zlib compression RHEL8 py3.13 No C
3134+
display_name: zlib compression RHEL8 py3.11 No C
31733135
run_on:
31743136
- rhel87-small
31753137
expansions:
31763138
COMPRESSORS: zlib
31773139
NO_EXT: "1"
3178-
PYTHON_BINARY: /opt/python/3.13/bin/python3
3179-
- name: zlib-compression-rhel8-py3.13
3140+
PYTHON_BINARY: /opt/python/3.11/bin/python3
3141+
- name: zlib-compression-rhel8-py3.12
31803142
tasks:
31813143
- name: .standalone
3182-
display_name: zlib compression RHEL8 py3.13
3144+
display_name: zlib compression RHEL8 py3.12
31833145
run_on:
31843146
- rhel87-small
31853147
expansions:
31863148
COMPRESSORS: zlib
3187-
PYTHON_BINARY: /opt/python/3.13/bin/python3
3188-
- name: zstd-compression-rhel8-py3.9-no-c
3189-
tasks:
3190-
- name: .standalone !.4.0
3191-
display_name: zstd compression RHEL8 py3.9 No C
3192-
run_on:
3193-
- rhel87-small
3194-
expansions:
3195-
COMPRESSORS: zstd
3196-
NO_EXT: "1"
3197-
PYTHON_BINARY: /opt/python/3.9/bin/python3
3198-
- name: zstd-compression-rhel8-py3.9
3199-
tasks:
3200-
- name: .standalone !.4.0
3201-
display_name: zstd compression RHEL8 py3.9
3202-
run_on:
3203-
- rhel87-small
3204-
expansions:
3205-
COMPRESSORS: zstd
3206-
PYTHON_BINARY: /opt/python/3.9/bin/python3
3149+
PYTHON_BINARY: /opt/python/3.12/bin/python3
32073150
- name: zstd-compression-rhel8-py3.13-no-c
32083151
tasks:
32093152
- name: .standalone !.4.0
@@ -3214,42 +3157,15 @@ buildvariants:
32143157
COMPRESSORS: zstd
32153158
NO_EXT: "1"
32163159
PYTHON_BINARY: /opt/python/3.13/bin/python3
3217-
- name: zstd-compression-rhel8-py3.13
3160+
- name: zstd-compression-rhel8-py3.9
32183161
tasks:
32193162
- name: .standalone !.4.0
3220-
display_name: zstd compression RHEL8 py3.13
3163+
display_name: zstd compression RHEL8 py3.9
32213164
run_on:
32223165
- rhel87-small
32233166
expansions:
32243167
COMPRESSORS: zstd
3225-
PYTHON_BINARY: /opt/python/3.13/bin/python3
3226-
- name: snappy-compression-rhel8-py3.10
3227-
tasks:
3228-
- name: .standalone
3229-
display_name: snappy compression RHEL8 py3.10
3230-
run_on:
3231-
- rhel87-small
3232-
expansions:
3233-
COMPRESSORS: snappy
3234-
PYTHON_BINARY: /opt/python/3.10/bin/python3
3235-
- name: snappy-compression-rhel8-py3.11
3236-
tasks:
3237-
- name: .standalone
3238-
display_name: snappy compression RHEL8 py3.11
3239-
run_on:
3240-
- rhel87-small
3241-
expansions:
3242-
COMPRESSORS: snappy
3243-
PYTHON_BINARY: /opt/python/3.11/bin/python3
3244-
- name: snappy-compression-rhel8-py3.12
3245-
tasks:
3246-
- name: .standalone
3247-
display_name: snappy compression RHEL8 py3.12
3248-
run_on:
3249-
- rhel87-small
3250-
expansions:
3251-
COMPRESSORS: snappy
3252-
PYTHON_BINARY: /opt/python/3.12/bin/python3
3168+
PYTHON_BINARY: /opt/python/3.9/bin/python3
32533169
- name: snappy-compression-rhel8-pypy3.9
32543170
tasks:
32553171
- name: .standalone
@@ -3259,51 +3175,6 @@ buildvariants:
32593175
expansions:
32603176
COMPRESSORS: snappy
32613177
PYTHON_BINARY: /opt/python/pypy3.9/bin/python3
3262-
- name: snappy-compression-rhel8-pypy3.10
3263-
tasks:
3264-
- name: .standalone
3265-
display_name: snappy compression RHEL8 pypy3.10
3266-
run_on:
3267-
- rhel87-small
3268-
expansions:
3269-
COMPRESSORS: snappy
3270-
PYTHON_BINARY: /opt/python/pypy3.10/bin/python3
3271-
- name: zlib-compression-rhel8-py3.10
3272-
tasks:
3273-
- name: .standalone
3274-
display_name: zlib compression RHEL8 py3.10
3275-
run_on:
3276-
- rhel87-small
3277-
expansions:
3278-
COMPRESSORS: zlib
3279-
PYTHON_BINARY: /opt/python/3.10/bin/python3
3280-
- name: zlib-compression-rhel8-py3.11
3281-
tasks:
3282-
- name: .standalone
3283-
display_name: zlib compression RHEL8 py3.11
3284-
run_on:
3285-
- rhel87-small
3286-
expansions:
3287-
COMPRESSORS: zlib
3288-
PYTHON_BINARY: /opt/python/3.11/bin/python3
3289-
- name: zlib-compression-rhel8-py3.12
3290-
tasks:
3291-
- name: .standalone
3292-
display_name: zlib compression RHEL8 py3.12
3293-
run_on:
3294-
- rhel87-small
3295-
expansions:
3296-
COMPRESSORS: zlib
3297-
PYTHON_BINARY: /opt/python/3.12/bin/python3
3298-
- name: zlib-compression-rhel8-pypy3.9
3299-
tasks:
3300-
- name: .standalone
3301-
display_name: zlib compression RHEL8 pypy3.9
3302-
run_on:
3303-
- rhel87-small
3304-
expansions:
3305-
COMPRESSORS: zlib
3306-
PYTHON_BINARY: /opt/python/pypy3.9/bin/python3
33073178
- name: zlib-compression-rhel8-pypy3.10
33083179
tasks:
33093180
- name: .standalone
@@ -3313,33 +3184,6 @@ buildvariants:
33133184
expansions:
33143185
COMPRESSORS: zlib
33153186
PYTHON_BINARY: /opt/python/pypy3.10/bin/python3
3316-
- name: zstd-compression-rhel8-py3.10
3317-
tasks:
3318-
- name: .standalone !.4.0
3319-
display_name: zstd compression RHEL8 py3.10
3320-
run_on:
3321-
- rhel87-small
3322-
expansions:
3323-
COMPRESSORS: zstd
3324-
PYTHON_BINARY: /opt/python/3.10/bin/python3
3325-
- name: zstd-compression-rhel8-py3.11
3326-
tasks:
3327-
- name: .standalone !.4.0
3328-
display_name: zstd compression RHEL8 py3.11
3329-
run_on:
3330-
- rhel87-small
3331-
expansions:
3332-
COMPRESSORS: zstd
3333-
PYTHON_BINARY: /opt/python/3.11/bin/python3
3334-
- name: zstd-compression-rhel8-py3.12
3335-
tasks:
3336-
- name: .standalone !.4.0
3337-
display_name: zstd compression RHEL8 py3.12
3338-
run_on:
3339-
- rhel87-small
3340-
expansions:
3341-
COMPRESSORS: zstd
3342-
PYTHON_BINARY: /opt/python/3.12/bin/python3
33433187
- name: zstd-compression-rhel8-pypy3.9
33443188
tasks:
33453189
- name: .standalone !.4.0
@@ -3349,15 +3193,6 @@ buildvariants:
33493193
expansions:
33503194
COMPRESSORS: zstd
33513195
PYTHON_BINARY: /opt/python/pypy3.9/bin/python3
3352-
- name: zstd-compression-rhel8-pypy3.10
3353-
tasks:
3354-
- name: .standalone !.4.0
3355-
display_name: zstd compression RHEL8 pypy3.10
3356-
run_on:
3357-
- rhel87-small
3358-
expansions:
3359-
COMPRESSORS: zstd
3360-
PYTHON_BINARY: /opt/python/pypy3.10/bin/python3
33613196

33623197
- matrix_name: "tests-fips"
33633198
matrix_spec:

‎.evergreen/scripts/generate_config.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -351,10 +351,11 @@ def create_compression_variants():
351351
host = "rhel8"
352352
task_names = dict(snappy=[".standalone"], zlib=[".standalone"], zstd=[".standalone !.4.0"])
353353
variants = []
354-
for compressor, python, c_ext in product(["snappy", "zlib", "zstd"], MIN_MAX_PYTHON, C_EXTS):
354+
for ind, (compressor, c_ext) in enumerate(product(["snappy", "zlib", "zstd"], C_EXTS)):
355355
expansions = dict(COMPRESSORS=compressor)
356356
handle_c_ext(c_ext, expansions)
357357
base_name = f"{compressor} compression"
358+
python = CPYTHONS[ind % len(CPYTHONS)]
358359
display_name = get_display_name(base_name, host, python=python, **expansions)
359360
variant = create_variant(
360361
task_names[compressor],
@@ -365,8 +366,8 @@ def create_compression_variants():
365366
)
366367
variants.append(variant)
367368

368-
other_pythons = [p for p in CPYTHONS if p not in MIN_MAX_PYTHON] + PYPYS
369-
for compressor, python in product(["snappy", "zlib", "zstd"], other_pythons):
369+
other_pythons = PYPYS + CPYTHONS[ind:]
370+
for compressor, python in zip_cycle(["snappy", "zlib", "zstd"], other_pythons):
370371
expansions = dict(COMPRESSORS=compressor)
371372
handle_c_ext(c_ext, expansions)
372373
base_name = f"{compressor} compression"

0 commit comments

Comments
 (0)