Skip to content

[integ-tests] Add older instance types in EXCLUDED_INSTANCE_TYPE_PREFIXES #7638

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hanwen-cluster merged 3 commits into from
Sep 28, 2026
+37 −32
Merged

[integ-tests] Add older instance types in EXCLUDED_INSTANCE_TYPE_PREFIXES #7638

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dc4b4df
[integ-tests] Declare the pcluster.constants the framework needs locally
hanwen-cluster Sep 10, 2026
1e417bc
[integ-tests] Add older instance types in EXCLUDED_INSTANCE_TYPE_PREF…
hanwen-cluster Sep 25, 2026
097a7f7
Merge branch 'integ-tests-3.16.1' into integ-tests-3.16.1
hanwen-cluster Sep 28, 2026
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
28 changes: 0 additions & 28 deletions cli/src/pcluster/constants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
UNSUPPORTED_OSES_FOR_P6_B300 = []
SUPPORTED_OSES_FOR_P6_B300 = list(set(SUPPORTED_OSES) - set(UNSUPPORTED_OSES_FOR_P6_B300))
UNSUPPORTED_OSES_FOR_DCV = []
UNSUPPORTED_OSES_FOR_NON_GPU_DCV = ["rocky9", "rhel9"]
UNSUPPORTED_ARM_OSES_FOR_DCV = []
UNSUPPORTED_OSES_FOR_LUSTRE = []
DELETE_POLICY = "Delete"
Expand Down Expand Up @@ -362,30 +361,3 @@ class Operation(Enum):
}
# Capacity Block states that are considered inactive (cannot check health status)
CAPACITY_BLOCK_INACTIVE_STATES = ["scheduled", "payment-pending", "assessing", "delayed"]

# Older generation instance types
# This constant is only used by test code
EXCLUDED_INSTANCE_TYPE_PREFIXES = (
"a1", # a1 is based on Graviton 1 which is not supported by the newer version of Amazon Linux 2023
"m1",
"m2",
"m3",
"m4",
"t1",
"t2",
"c1",
"c3",
"c4",
"r3",
"r4",
"x1",
"x1e",
"d2",
"h1",
"i2",
"i3",
"f1",
"g3",
"p2",
"p3",
)
7 changes: 4 additions & 3 deletions tests/integration-tests/framework/tests_configuration/config_renderer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,18 @@
from conftest_networking import AVAILABLE_AVAILABILITY_ZONE
from jinja2 import FileSystemLoader, meta
from jinja2.sandbox import SandboxedEnvironment
from utils import InstanceTypesData
from utils import EXCLUDED_INSTANCE_TYPE_PREFIXES, InstanceTypesData

from pcluster.constants import (
EXCLUDED_INSTANCE_TYPE_PREFIXES,
SUPPORTED_OSES,
UNSUPPORTED_ARM_OSES_FOR_DCV,
UNSUPPORTED_OSES_FOR_DCV,
UNSUPPORTED_OSES_FOR_LUSTRE,
UNSUPPORTED_OSES_FOR_NON_GPU_DCV,
)

# Declared here rather than imported from pcluster.constants, which does not have it in the older ParallelCluster
# versions the Slurm upgrade suite runs against.
UNSUPPORTED_OSES_FOR_NON_GPU_DCV = ["rocky9", "rhel9"]
# An instant capacity block starts ~30 minutes after the request; allow some slack when telling
# instant offerings apart from standard ones (which start at the next 11:30 UTC boundary).
INSTANT_CAPACITY_BLOCK_START_MINUTES = 45
Expand Down
34 changes: 33 additions & 1 deletion tests/integration-tests/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,39 @@
from retrying import retry
from time_utils import minutes, seconds

from pcluster.constants import EXCLUDED_INSTANCE_TYPE_PREFIXES
# Declared here rather than imported from pcluster.constants, which does not have it in the older ParallelCluster
# versions the Slurm upgrade suite runs against.
EXCLUDED_INSTANCE_TYPE_PREFIXES = (
"a1", # a1 is based on Graviton 1 which is not supported by the newer version of Amazon Linux 2023
"m1",
"m2",
"m3",
"m4",
"t1",
"t2",
"c1",
"c3",
"c4",
"cc1",
"cc2",
"cr1",
"r3",
"r4",
"x1",
"x1e",
"d2",
"h1",
"hi1",
"hs1",
"i2",
"i3",
"f1",
"cg1",
"g2",
"g3",
"p2",
"p3",
)

DEFAULT_PARTITION = "aws"
PARTITION_MAP = {
Expand Down
Loading