Skip to content

Commit 5f254e8

Browse files
authored
Merge branch 'main' into allow-snapshot-tap-changes
2 parents 893686d + 3476905 commit 5f254e8

9 files changed

+8445
-6
lines changed

.buildkite/common.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ def __init__(self, with_build_step=True, **kwargs):
256256
self.per_instance = overlay_dict(per_instance, args.step_param)
257257
self.per_arch = self.per_instance.copy()
258258
self.per_arch["instances"] = ["m6i.metal", "m7g.metal"]
259-
self.per_arch["platforms"] = [("al2", "linux_5.10")]
259+
self.per_arch["platforms"] = [("al2023", "linux_6.1")]
260260
self.binary_dir = args.binary_dir
261261
# Build sharing
262262
if with_build_step:

.buildkite/pipeline_cpu_template.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
from enum import Enum
88

9-
from common import DEFAULT_INSTANCES, DEFAULT_PLATFORMS, BKPipeline, group
9+
from common import DEFAULT_PLATFORMS, BKPipeline, group
1010

1111

1212
class BkStep(str, Enum):
@@ -27,15 +27,12 @@ class BkStep(str, Enum):
2727
],
2828
BkStep.LABEL: "📖 rdmsr",
2929
"instances": ["c5n.metal", "m5n.metal", "m6a.metal", "m6i.metal"],
30-
"platforms": DEFAULT_PLATFORMS,
3130
},
3231
"fingerprint": {
3332
BkStep.COMMAND: [
3433
"tools/devtool -y test --no-build -- -m no_block_pr integration_tests/functional/test_cpu_template_helper.py -k test_guest_cpu_config_change",
3534
],
3635
BkStep.LABEL: "🖐️ fingerprint",
37-
"instances": DEFAULT_INSTANCES,
38-
"platforms": DEFAULT_PLATFORMS,
3936
},
4037
"cpuid_wrmsr": {
4138
"snapshot": {

.buildkite/pipeline_pr.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
# Kani step default
6060
# Kani runs fastest on m6a.metal
6161
instances=["m6a.metal", "m7g.metal"],
62-
platforms=[("al2", "linux_5.10")],
62+
platforms=[("al2023", "linux_6.1")],
6363
timeout_in_minutes=300,
6464
**DEFAULTS_PERF,
6565
depends_on_build=False,

0 commit comments

Comments
 (0)