Skip to content

Commit c33bc6c

Browse files
committed
refactor: buildkite: store architecture per instance
Store whether a given instances is x86 or arm Signed-off-by: Patrick Roy <[email protected]>
1 parent 19adcff commit c33bc6c

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

.buildkite/common.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313
import subprocess
1414
from pathlib import Path
1515

16-
DEFAULT_INSTANCES = [
17-
"c5n.metal", # Intel Skylake
18-
"m5n.metal", # Intel Cascade Lake
19-
"m6i.metal", # Intel Icelake
20-
"m6a.metal", # AMD Milan
21-
"m6g.metal", # Graviton2
22-
"m7g.metal", # Graviton3
23-
]
16+
DEFAULT_INSTANCES = {
17+
"c5n.metal": "x86_64", # Intel Skylake
18+
"m5n.metal": "x86_64", # Intel Cascade Lake
19+
"m6i.metal": "x86_64", # Intel Icelake
20+
"m6a.metal": "x86_64", # AMD Milan
21+
"m6g.metal": "aarch64", # Graviton2
22+
"m7g.metal": "aarch64", # Graviton3
23+
}
2424

2525
DEFAULT_PLATFORMS = [
2626
("al2", "linux_5.10"),
@@ -146,7 +146,7 @@ def __call__(self, parser, namespace, value, option_string=None):
146146
"--instances",
147147
required=False,
148148
nargs="+",
149-
default=DEFAULT_INSTANCES,
149+
default=DEFAULT_INSTANCES.keys(),
150150
)
151151
COMMON_PARSER.add_argument(
152152
"--platforms",

.buildkite/pipeline_cpu_template.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class BkStep(str, Enum):
3434
"tools/devtool -y test --no-build -- -m no_block_pr integration_tests/functional/test_cpu_template_helper.py -k test_guest_cpu_config_change",
3535
],
3636
BkStep.LABEL: "🖐️ fingerprint",
37-
"instances": DEFAULT_INSTANCES,
37+
"instances": DEFAULT_INSTANCES.keys(),
3838
"platforms": DEFAULT_PLATFORMS,
3939
},
4040
"cpuid_wrmsr": {

0 commit comments

Comments
 (0)