Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 24 additions & 24 deletions .evergreen/generated_configs/variants.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildvariants:
display_name: OpenSSL 1.0.2 RHEL7 v5.0 Python3.9
run_on:
- rhel79-small
batchtime: 10080
batchtime: 1440
expansions:
VERSION: "5.0"
PYTHON_VERSION: "3.9"
Expand All @@ -17,7 +17,7 @@ buildvariants:
display_name: Other hosts RHEL9-FIPS latest
run_on:
- rhel92-fips
batchtime: 10080
batchtime: 1440
expansions:
VERSION: latest
NO_EXT: "1"
Expand All @@ -29,7 +29,7 @@ buildvariants:
display_name: Other hosts RHEL8-zseries latest
run_on:
- rhel8-zseries-small
batchtime: 10080
batchtime: 1440
expansions:
VERSION: latest
NO_EXT: "1"
Expand All @@ -40,7 +40,7 @@ buildvariants:
display_name: Other hosts RHEL8-POWER8 latest
run_on:
- rhel8-power-small
batchtime: 10080
batchtime: 1440
expansions:
VERSION: latest
NO_EXT: "1"
Expand All @@ -51,7 +51,7 @@ buildvariants:
display_name: Other hosts RHEL8-arm64 latest
run_on:
- rhel82-arm64-small
batchtime: 10080
batchtime: 1440
expansions:
VERSION: latest
NO_EXT: "1"
Expand All @@ -62,7 +62,7 @@ buildvariants:
display_name: Other hosts Amazon2023 latest
run_on:
- amazon2023-arm64-latest-large-m8g
batchtime: 10080
batchtime: 1440
expansions:
VERSION: latest
NO_EXT: "1"
Expand Down Expand Up @@ -182,7 +182,7 @@ buildvariants:
display_name: Encryption RHEL8
run_on:
- rhel87-small
batchtime: 10080
batchtime: 1440
expansions:
TEST_NAME: encryption
tags: [encryption_tag]
Expand All @@ -192,7 +192,7 @@ buildvariants:
display_name: Encryption macOS
run_on:
- macos-14
batchtime: 10080
batchtime: 1440
expansions:
TEST_NAME: encryption
tags: [encryption_tag]
Expand All @@ -202,7 +202,7 @@ buildvariants:
display_name: Encryption Win64
run_on:
- windows-64-vsMulti-small
batchtime: 10080
batchtime: 1440
expansions:
TEST_NAME: encryption
tags: [encryption_tag]
Expand All @@ -212,7 +212,7 @@ buildvariants:
display_name: Encryption crypt_shared RHEL8
run_on:
- rhel87-small
batchtime: 10080
batchtime: 1440
expansions:
TEST_NAME: encryption
TEST_CRYPT_SHARED: "true"
Expand All @@ -223,7 +223,7 @@ buildvariants:
display_name: Encryption crypt_shared macOS
run_on:
- macos-14
batchtime: 10080
batchtime: 1440
expansions:
TEST_NAME: encryption
TEST_CRYPT_SHARED: "true"
Expand All @@ -234,7 +234,7 @@ buildvariants:
display_name: Encryption crypt_shared Win64
run_on:
- windows-64-vsMulti-small
batchtime: 10080
batchtime: 1440
expansions:
TEST_NAME: encryption
TEST_CRYPT_SHARED: "true"
Expand All @@ -245,7 +245,7 @@ buildvariants:
display_name: Encryption PyOpenSSL RHEL8
run_on:
- rhel87-small
batchtime: 10080
batchtime: 1440
expansions:
TEST_NAME: encryption
SUB_TEST_NAME: pyopenssl
Expand Down Expand Up @@ -348,10 +348,10 @@ buildvariants:
- name: kms
tasks:
- name: test-gcpkms
batchtime: 10080
batchtime: 1440
- name: test-gcpkms-fail
- name: test-azurekms
batchtime: 10080
batchtime: 1440
- name: test-azurekms-fail
display_name: KMS
run_on:
Expand All @@ -368,7 +368,7 @@ buildvariants:
display_name: Load Balancer
run_on:
- rhel87-small
batchtime: 10080
batchtime: 1440
expansions:
TEST_NAME: load_balancer

Expand Down Expand Up @@ -442,29 +442,29 @@ buildvariants:
display_name: Auth OIDC Ubuntu-22
run_on:
- ubuntu2204-small
batchtime: 10080
batchtime: 1440
- name: auth-oidc-local-ubuntu-22
tasks:
- name: "!.auth_oidc_remote .auth_oidc"
display_name: Auth OIDC Local Ubuntu-22
run_on:
- ubuntu2204-small
batchtime: 10080
batchtime: 1440
tags: [pr]
- name: auth-oidc-macos
tasks:
- name: "!.auth_oidc_remote .auth_oidc"
display_name: Auth OIDC macOS
run_on:
- macos-14
batchtime: 10080
batchtime: 1440
- name: auth-oidc-win64
tasks:
- name: "!.auth_oidc_remote .auth_oidc"
display_name: Auth OIDC Win64
run_on:
- windows-64-vsMulti-small
batchtime: 10080
batchtime: 1440

# Perf tests
- name: performance-benchmarks
Expand All @@ -473,7 +473,7 @@ buildvariants:
display_name: Performance Benchmarks
run_on:
- rhel90-dbx-perf-large
batchtime: 10080
batchtime: 1440

# Pyopenssl tests
- name: pyopenssl-rhel8
Expand All @@ -483,7 +483,7 @@ buildvariants:
display_name: PyOpenSSL RHEL8
run_on:
- rhel87-small
batchtime: 10080
batchtime: 1440
expansions:
SUB_TEST_NAME: pyopenssl
- name: pyopenssl-macos
Expand All @@ -493,7 +493,7 @@ buildvariants:
display_name: PyOpenSSL macOS
run_on:
- rhel87-small
batchtime: 10080
batchtime: 1440
expansions:
SUB_TEST_NAME: pyopenssl
- name: pyopenssl-win64
Expand All @@ -503,7 +503,7 @@ buildvariants:
display_name: PyOpenSSL Win64
run_on:
- rhel87-small
batchtime: 10080
batchtime: 1440
expansions:
SUB_TEST_NAME: pyopenssl

Expand Down
21 changes: 10 additions & 11 deletions .evergreen/scripts/generate_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
from generate_config_utils import (
ALL_PYTHONS,
ALL_VERSIONS,
BATCHTIME_DAY,
BATCHTIME_WEEK,
C_EXTS,
CPYTHONS,
Expand Down Expand Up @@ -126,7 +127,7 @@ def create_free_threaded_variants() -> list[BuildVariant]:
def create_encryption_variants() -> list[BuildVariant]:
variants = []
tags = ["encryption_tag"]
batchtime = BATCHTIME_WEEK
batchtime = BATCHTIME_DAY

def get_encryption_expansions(encryption):
expansions = dict(TEST_NAME="encryption")
Expand Down Expand Up @@ -183,7 +184,7 @@ def create_load_balancer_variants():
tasks,
"Load Balancer",
host=DEFAULT_HOST,
batchtime=BATCHTIME_WEEK,
batchtime=BATCHTIME_DAY,
expansions=expansions,
)
]
Expand Down Expand Up @@ -226,7 +227,7 @@ def create_enterprise_auth_variants():

def create_pyopenssl_variants():
base_name = "PyOpenSSL"
batchtime = BATCHTIME_WEEK
batchtime = BATCHTIME_DAY
expansions = dict(SUB_TEST_NAME="pyopenssl")
variants = []

Expand Down Expand Up @@ -352,7 +353,7 @@ def create_oidc_auth_variants():
tasks,
get_variant_name("Auth OIDC", host),
host=host,
batchtime=BATCHTIME_WEEK,
batchtime=BATCHTIME_DAY,
)
)
# Add a specific local test to run on PRs.
Expand All @@ -364,7 +365,7 @@ def create_oidc_auth_variants():
get_variant_name("Auth OIDC Local", host),
tags=["pr"],
host=host,
batchtime=BATCHTIME_WEEK,
batchtime=BATCHTIME_DAY,
)
)
return variants
Expand Down Expand Up @@ -429,9 +430,9 @@ def create_coverage_report_variants():

def create_kms_variants():
tasks = []
tasks.append(EvgTaskRef(name="test-gcpkms", batchtime=BATCHTIME_WEEK))
tasks.append(EvgTaskRef(name="test-gcpkms", batchtime=BATCHTIME_DAY))
tasks.append("test-gcpkms-fail")
tasks.append(EvgTaskRef(name="test-azurekms", batchtime=BATCHTIME_WEEK))
tasks.append(EvgTaskRef(name="test-azurekms", batchtime=BATCHTIME_DAY))
tasks.append("test-azurekms-fail")
return [create_variant(tasks, "KMS", host=HOSTS["debian11"])]

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

def create_perf_variants():
host = HOSTS["perf"]
return [
create_variant([".perf"], "Performance Benchmarks", host=host, batchtime=BATCHTIME_WEEK)
]
return [create_variant([".perf"], "Performance Benchmarks", host=host, batchtime=BATCHTIME_DAY)]


def create_aws_auth_variants():
Expand Down Expand Up @@ -482,7 +481,7 @@ def create_no_server_variants():


def create_alternative_hosts_variants():
batchtime = BATCHTIME_WEEK
batchtime = BATCHTIME_DAY
variants = []

host = HOSTS["rhel7"]
Expand Down
1 change: 1 addition & 0 deletions .evergreen/scripts/generate_config_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
ALL_PYTHONS = CPYTHONS + PYPYS
MIN_MAX_PYTHON = [CPYTHONS[0], CPYTHONS[-1]]
BATCHTIME_WEEK = 10080
BATCHTIME_DAY = 1440
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe this is number is supposed to be minutes a day

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, "the interval of time (in minutes) that Evergreen should wait in between activating the latest version."

AUTH_SSLS = [("auth", "ssl"), ("noauth", "ssl"), ("noauth", "nossl")]
TOPOLOGIES = ["standalone", "replica_set", "sharded_cluster"]
C_EXTS = ["without_ext", "with_ext"]
Expand Down
Loading