Skip to content

fix(ci): resolve runners with the therock-ci-config v2 API #12960

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
andraghetti merged 2 commits into from
Oct 12, 2026
Merged

fix(ci): resolve runners with the therock-ci-config v2 API #12960

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6740c23
fix(ci): resolve runners with the therock-ci-config v2 API
andraghetti Oct 5, 2026
c70bfb8
test(ci): port the resolve-ci-config tests to the v2 config API
andraghetti Oct 5, 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
3 changes: 1 addition & 2 deletions .github/actions/rocprofiler-sdk-util/resolve-ci-config/resolve_ci_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
"gfx120x",
"gfx1151",
]
TRIGGER_TYPES = ["presubmit", "postsubmit", "nightly"]


def warn(message: str) -> None:
Expand All @@ -35,7 +34,7 @@ def load_ci_configs(
from ci_config_api import load_config

config = load_config(version=2, config_path=config_path)
all_families = config.get_gpu_families(TRIGGER_TYPES)
all_families = config.get_gpu_runner_labels()
gpu_configs = {
family: all_families.get(family, {}).get("linux", {})
for family in GPU_FAMILIES
Expand Down
124 changes: 31 additions & 93 deletions .github/actions/rocprofiler-sdk-util/resolve-ci-config/test_resolve_ci_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
from pathlib import Path
from unittest.mock import patch

from resolve_ci_config import GPU_FAMILIES, TRIGGER_TYPES, load_gpu_configs, main
from resolve_ci_config import GPU_FAMILIES, load_gpu_configs, main

SAMPLE_RUNNER_CONFIG = {
"version": "1",
"version": "2",
"build_runners": {
"linux": {
"default": [
Expand All @@ -22,69 +22,25 @@
]
}
},
"gpu_families": {
"presubmit": {
"gfx94x": {
"linux": {
"test-runs-on": "linux-gfx942-1gpu-ccs-csp-ossci-rocm",
"test-runs-on-sandbox": "linux-mi325-gpu-rocm-cpu-sandbox",
"family": "gfx94X-dcgpu",
"fetch-gfx-targets": ["gfx942"],
}
},
"gfx110x": {
"linux": {
"test-runs-on": "linux-gfx110X-gpu-rocm",
"family": "gfx110X-all",
"fetch-gfx-targets": [],
}
},
"gfx120x": {
"linux": {
"test-runs-on": "linux-gfx120X-gpu-rocm",
"family": "gfx120X-all",
"fetch-gfx-targets": ["gfx1200", "gfx1201"],
}
},
"gfx1151": {
"linux": {
"test-runs-on": "linux-gfx1151-gpu-rocm",
"family": "gfx1151",
"fetch-gfx-targets": ["gfx1151"],
}
},
},
"postsubmit": {
"gfx950": {
"linux": {
"test-runs-on": "linux-gfx950-1gpu-ccs-ossci-rocm",
"family": "gfx950-dcgpu",
"fetch-gfx-targets": ["gfx950"],
}
"gpu_runner_labels": {
"gfx94x": {
"linux": {
"test-runs-on": "linux-gfx942-1gpu-ccs-csp-ossci-rocm",
"test-runs-on-sandbox": "linux-mi325-gpu-rocm-cpu-sandbox",
}
},
"nightly": {
"gfx90a": {
"linux": {
"test-runs-on": "linux-gfx90a-gpu-rocm",
"family": "gfx90a",
"fetch-gfx-targets": ["gfx90a"],
}
},
"gfx103x": {
"linux": {
"test-runs-on": "linux-gfx1030-gpu-rocm",
"family": "gfx103X-all",
"fetch-gfx-targets": ["gfx1030"],
}
},
},
"gfx110x": {"linux": {"test-runs-on": "linux-gfx110X-gpu-rocm"}},
"gfx120x": {"linux": {"test-runs-on": "linux-gfx120X-gpu-rocm"}},
"gfx1151": {"linux": {"test-runs-on": "linux-gfx1151-gpu-rocm"}},
"gfx950": {"linux": {"test-runs-on": "linux-gfx950-1gpu-ccs-ossci-rocm"}},
"gfx90a": {"linux": {"test-runs-on": "linux-gfx90a-gpu-rocm"}},
"gfx103x": {"linux": {"test-runs-on": "linux-gfx1030-gpu-rocm"}},
},
}


def _write_config(tmpdir: Path, config: dict) -> None:
(tmpdir / "runner-config.json").write_text(json.dumps(config))
(tmpdir / "runner-config-v2.json").write_text(json.dumps(config))
ci_api = textwrap.dedent("""\
import json
from pathlib import Path
Expand All @@ -94,24 +50,19 @@ def _write_config(tmpdir: Path, config: dict) -> None:
@dataclass
class Config:
build_runners: dict
gpu_families: dict
gpu_runner_labels: dict
_raw: dict
def get_gpu_families(self, trigger_types):
result = {}
for tt in trigger_types:
if tt in self.gpu_families:
for name, cfg in self.gpu_families[tt].items():
result[name] = cfg
return result
def get_gpu_runner_labels(self):
return self.gpu_runner_labels

def load_config(version=2, config_path=None):
if config_path is None:
config_path = Path(__file__).parent
with open(config_path / "runner-config.json") as f:
with open(config_path / "runner-config-v2.json") as f:
raw = json.load(f)
return Config(
build_runners=raw["build_runners"],
gpu_families=raw["gpu_families"],
gpu_runner_labels=raw["gpu_runner_labels"],
_raw=raw,
)
""")
Expand Down Expand Up @@ -160,16 +111,12 @@ def test_loads_all_families_from_config(self):

def test_missing_family_returns_empty_dict(self):
config = {
"version": "1",
"version": "2",
"build_runners": {},
"gpu_families": {
"presubmit": {
"gfx94x": {
"linux": {
"test-runs-on": "some-runner",
"family": "f",
"fetch-gfx-targets": [],
}
"gpu_runner_labels": {
"gfx94x": {
"linux": {
"test-runs-on": "some-runner",
}
}
},
Expand All @@ -191,7 +138,7 @@ def test_returns_empty_on_import_error(self):
with tempfile.TemporaryDirectory() as tmpdir:
tmpdir = Path(tmpdir)
(tmpdir / "ci_config_api.py").write_text("raise ImportError('broken')")
(tmpdir / "runner-config.json").write_text("{}")
(tmpdir / "runner-config-v2.json").write_text("{}")
result = load_gpu_configs(tmpdir)
self.assertEqual(result, {})

Expand Down Expand Up @@ -277,17 +224,13 @@ def test_falls_back_to_env_when_config_missing(self):

def test_partial_config_uses_fallback_for_missing_families(self):
partial_config = {
"version": "1",
"version": "2",
"build_runners": {},
"gpu_families": {
"presubmit": {
"gfx94x": {
"linux": {
"test-runs-on": "configured-gfx94x",
"test-runs-on-sandbox": "configured-sandbox",
"family": "f",
"fetch-gfx-targets": [],
}
"gpu_runner_labels": {
"gfx94x": {
"linux": {
"test-runs-on": "configured-gfx94x",
"test-runs-on-sandbox": "configured-sandbox",
}
}
},
Expand Down Expand Up @@ -316,11 +259,6 @@ class TestConstants(unittest.TestCase):
def test_gpu_families_not_empty(self):
self.assertTrue(len(GPU_FAMILIES) > 0)

def test_trigger_types_cover_all_scopes(self):
self.assertIn("presubmit", TRIGGER_TYPES)
self.assertIn("postsubmit", TRIGGER_TYPES)
self.assertIn("nightly", TRIGGER_TYPES)


if __name__ == "__main__":
unittest.main()
Loading