Skip to content

Commit dd6ec01

Browse files
sleepySticksleepyStick
committed
create var batchtime_day and use it
1 parent 6fe8543 commit dd6ec01

File tree

3 files changed

+35
-35
lines changed

3 files changed

+35
-35
lines changed

‎.evergreen/generated_configs/variants.yml‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildvariants:
66
display_name: OpenSSL 1.0.2 RHEL7 v5.0 Python3.9
77
run_on:
88
- rhel79-small
9-
batchtime: 10080
9+
batchtime: 1440
1010
expansions:
1111
VERSION: "5.0"
1212
PYTHON_VERSION: "3.9"
@@ -17,7 +17,7 @@ buildvariants:
1717
display_name: Other hosts RHEL9-FIPS latest
1818
run_on:
1919
- rhel92-fips
20-
batchtime: 10080
20+
batchtime: 1440
2121
expansions:
2222
VERSION: latest
2323
NO_EXT: "1"
@@ -29,7 +29,7 @@ buildvariants:
2929
display_name: Other hosts RHEL8-zseries latest
3030
run_on:
3131
- rhel8-zseries-small
32-
batchtime: 10080
32+
batchtime: 1440
3333
expansions:
3434
VERSION: latest
3535
NO_EXT: "1"
@@ -40,7 +40,7 @@ buildvariants:
4040
display_name: Other hosts RHEL8-POWER8 latest
4141
run_on:
4242
- rhel8-power-small
43-
batchtime: 10080
43+
batchtime: 1440
4444
expansions:
4545
VERSION: latest
4646
NO_EXT: "1"
@@ -51,7 +51,7 @@ buildvariants:
5151
display_name: Other hosts RHEL8-arm64 latest
5252
run_on:
5353
- rhel82-arm64-small
54-
batchtime: 10080
54+
batchtime: 1440
5555
expansions:
5656
VERSION: latest
5757
NO_EXT: "1"
@@ -62,7 +62,7 @@ buildvariants:
6262
display_name: Other hosts Amazon2023 latest
6363
run_on:
6464
- amazon2023-arm64-latest-large-m8g
65-
batchtime: 10080
65+
batchtime: 1440
6666
expansions:
6767
VERSION: latest
6868
NO_EXT: "1"
@@ -182,7 +182,7 @@ buildvariants:
182182
display_name: Encryption RHEL8
183183
run_on:
184184
- rhel87-small
185-
batchtime: 10080
185+
batchtime: 1440
186186
expansions:
187187
TEST_NAME: encryption
188188
tags: [encryption_tag]
@@ -192,7 +192,7 @@ buildvariants:
192192
display_name: Encryption macOS
193193
run_on:
194194
- macos-14
195-
batchtime: 10080
195+
batchtime: 1440
196196
expansions:
197197
TEST_NAME: encryption
198198
tags: [encryption_tag]
@@ -202,7 +202,7 @@ buildvariants:
202202
display_name: Encryption Win64
203203
run_on:
204204
- windows-64-vsMulti-small
205-
batchtime: 10080
205+
batchtime: 1440
206206
expansions:
207207
TEST_NAME: encryption
208208
tags: [encryption_tag]
@@ -212,7 +212,7 @@ buildvariants:
212212
display_name: Encryption crypt_shared RHEL8
213213
run_on:
214214
- rhel87-small
215-
batchtime: 10080
215+
batchtime: 1440
216216
expansions:
217217
TEST_NAME: encryption
218218
TEST_CRYPT_SHARED: "true"
@@ -223,7 +223,7 @@ buildvariants:
223223
display_name: Encryption crypt_shared macOS
224224
run_on:
225225
- macos-14
226-
batchtime: 10080
226+
batchtime: 1440
227227
expansions:
228228
TEST_NAME: encryption
229229
TEST_CRYPT_SHARED: "true"
@@ -234,7 +234,7 @@ buildvariants:
234234
display_name: Encryption crypt_shared Win64
235235
run_on:
236236
- windows-64-vsMulti-small
237-
batchtime: 10080
237+
batchtime: 1440
238238
expansions:
239239
TEST_NAME: encryption
240240
TEST_CRYPT_SHARED: "true"
@@ -245,7 +245,7 @@ buildvariants:
245245
display_name: Encryption PyOpenSSL RHEL8
246246
run_on:
247247
- rhel87-small
248-
batchtime: 10080
248+
batchtime: 1440
249249
expansions:
250250
TEST_NAME: encryption
251251
SUB_TEST_NAME: pyopenssl
@@ -348,10 +348,10 @@ buildvariants:
348348
- name: kms
349349
tasks:
350350
- name: test-gcpkms
351-
batchtime: 10080
351+
batchtime: 1440
352352
- name: test-gcpkms-fail
353353
- name: test-azurekms
354-
batchtime: 10080
354+
batchtime: 1440
355355
- name: test-azurekms-fail
356356
display_name: KMS
357357
run_on:
@@ -368,7 +368,7 @@ buildvariants:
368368
display_name: Load Balancer
369369
run_on:
370370
- rhel87-small
371-
batchtime: 10080
371+
batchtime: 1440
372372
expansions:
373373
TEST_NAME: load_balancer
374374

@@ -442,29 +442,29 @@ buildvariants:
442442
display_name: Auth OIDC Ubuntu-22
443443
run_on:
444444
- ubuntu2204-small
445-
batchtime: 10080
445+
batchtime: 1440
446446
- name: auth-oidc-local-ubuntu-22
447447
tasks:
448448
- name: "!.auth_oidc_remote .auth_oidc"
449449
display_name: Auth OIDC Local Ubuntu-22
450450
run_on:
451451
- ubuntu2204-small
452-
batchtime: 10080
452+
batchtime: 1440
453453
tags: [pr]
454454
- name: auth-oidc-macos
455455
tasks:
456456
- name: "!.auth_oidc_remote .auth_oidc"
457457
display_name: Auth OIDC macOS
458458
run_on:
459459
- macos-14
460-
batchtime: 10080
460+
batchtime: 1440
461461
- name: auth-oidc-win64
462462
tasks:
463463
- name: "!.auth_oidc_remote .auth_oidc"
464464
display_name: Auth OIDC Win64
465465
run_on:
466466
- windows-64-vsMulti-small
467-
batchtime: 10080
467+
batchtime: 1440
468468

469469
# Perf tests
470470
- name: performance-benchmarks
@@ -473,7 +473,7 @@ buildvariants:
473473
display_name: Performance Benchmarks
474474
run_on:
475475
- rhel90-dbx-perf-large
476-
batchtime: 10080
476+
batchtime: 1440
477477

478478
# Pyopenssl tests
479479
- name: pyopenssl-rhel8
@@ -483,7 +483,7 @@ buildvariants:
483483
display_name: PyOpenSSL RHEL8
484484
run_on:
485485
- rhel87-small
486-
batchtime: 10080
486+
batchtime: 1440
487487
expansions:
488488
SUB_TEST_NAME: pyopenssl
489489
- name: pyopenssl-macos
@@ -493,7 +493,7 @@ buildvariants:
493493
display_name: PyOpenSSL macOS
494494
run_on:
495495
- rhel87-small
496-
batchtime: 10080
496+
batchtime: 1440
497497
expansions:
498498
SUB_TEST_NAME: pyopenssl
499499
- name: pyopenssl-win64
@@ -503,7 +503,7 @@ buildvariants:
503503
display_name: PyOpenSSL Win64
504504
run_on:
505505
- rhel87-small
506-
batchtime: 10080
506+
batchtime: 1440
507507
expansions:
508508
SUB_TEST_NAME: pyopenssl
509509

‎.evergreen/scripts/generate_config.py‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
from generate_config_utils import (
88
ALL_PYTHONS,
99
ALL_VERSIONS,
10+
BATCHTIME_DAY,
1011
BATCHTIME_WEEK,
1112
C_EXTS,
1213
CPYTHONS,
@@ -126,7 +127,7 @@ def create_free_threaded_variants() -> list[BuildVariant]:
126127
def create_encryption_variants() -> list[BuildVariant]:
127128
variants = []
128129
tags = ["encryption_tag"]
129-
batchtime = BATCHTIME_WEEK
130+
batchtime = BATCHTIME_DAY
130131

131132
def get_encryption_expansions(encryption):
132133
expansions = dict(TEST_NAME="encryption")
@@ -183,7 +184,7 @@ def create_load_balancer_variants():
183184
tasks,
184185
"Load Balancer",
185186
host=DEFAULT_HOST,
186-
batchtime=BATCHTIME_WEEK,
187+
batchtime=BATCHTIME_DAY,
187188
expansions=expansions,
188189
)
189190
]
@@ -226,7 +227,7 @@ def create_enterprise_auth_variants():
226227

227228
def create_pyopenssl_variants():
228229
base_name = "PyOpenSSL"
229-
batchtime = BATCHTIME_WEEK
230+
batchtime = BATCHTIME_DAY
230231
expansions = dict(SUB_TEST_NAME="pyopenssl")
231232
variants = []
232233

@@ -352,7 +353,7 @@ def create_oidc_auth_variants():
352353
tasks,
353354
get_variant_name("Auth OIDC", host),
354355
host=host,
355-
batchtime=BATCHTIME_WEEK,
356+
batchtime=BATCHTIME_DAY,
356357
)
357358
)
358359
# Add a specific local test to run on PRs.
@@ -364,7 +365,7 @@ def create_oidc_auth_variants():
364365
get_variant_name("Auth OIDC Local", host),
365366
tags=["pr"],
366367
host=host,
367-
batchtime=BATCHTIME_WEEK,
368+
batchtime=BATCHTIME_DAY,
368369
)
369370
)
370371
return variants
@@ -429,9 +430,9 @@ def create_coverage_report_variants():
429430

430431
def create_kms_variants():
431432
tasks = []
432-
tasks.append(EvgTaskRef(name="test-gcpkms", batchtime=BATCHTIME_WEEK))
433+
tasks.append(EvgTaskRef(name="test-gcpkms", batchtime=BATCHTIME_DAY))
433434
tasks.append("test-gcpkms-fail")
434-
tasks.append(EvgTaskRef(name="test-azurekms", batchtime=BATCHTIME_WEEK))
435+
tasks.append(EvgTaskRef(name="test-azurekms", batchtime=BATCHTIME_DAY))
435436
tasks.append("test-azurekms-fail")
436437
return [create_variant(tasks, "KMS", host=HOSTS["debian11"])]
437438

@@ -446,9 +447,7 @@ def create_backport_pr_variants():
446447

447448
def create_perf_variants():
448449
host = HOSTS["perf"]
449-
return [
450-
create_variant([".perf"], "Performance Benchmarks", host=host, batchtime=BATCHTIME_WEEK)
451-
]
450+
return [create_variant([".perf"], "Performance Benchmarks", host=host, batchtime=BATCHTIME_DAY)]
452451

453452

454453
def create_aws_auth_variants():
@@ -482,7 +481,7 @@ def create_no_server_variants():
482481

483482

484483
def create_alternative_hosts_variants():
485-
batchtime = BATCHTIME_WEEK
484+
batchtime = BATCHTIME_DAY
486485
variants = []
487486

488487
host = HOSTS["rhel7"]

‎.evergreen/scripts/generate_config_utils.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
ALL_PYTHONS = CPYTHONS + PYPYS
2828
MIN_MAX_PYTHON = [CPYTHONS[0], CPYTHONS[-1]]
2929
BATCHTIME_WEEK = 10080
30+
BATCHTIME_DAY = 1440
3031
AUTH_SSLS = [("auth", "ssl"), ("noauth", "ssl"), ("noauth", "nossl")]
3132
TOPOLOGIES = ["standalone", "replica_set", "sharded_cluster"]
3233
C_EXTS = ["without_ext", "with_ext"]

0 commit comments

Comments
 (0)