Skip to content

Commit 0489202

Browse files
k-risterclaude
andcommitted
feat: remove deprecated runner-type and runner-tags from CI workflows
The capability-based matching in rickshaw PR#824 replaced the runner-type bifurcation. These parameters are no longer needed — runner pool capabilities and labels are now defined in crucible-ci.json. Also respect endpoint enabled flag in get-endpoints.py. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent 826b65a commit 0489202

4 files changed

Lines changed: 10 additions & 10 deletions

File tree

‎.github/actions/get-endpoints/get-endpoints.py‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ def main():
3838
with open(ci_config_file) as fh:
3939
config = json.load(fh)
4040

41+
endpoint_configs = config.get("endpoints", {})
4142
endpoints = set()
4243
if config["config"]["enabled"]:
4344
for benchmark in config["benchmarks"]:
@@ -46,7 +47,9 @@ def main():
4647
for scenario in benchmark["scenarios"]:
4748
if scenario["enabled"]:
4849
for endpoint in scenario["endpoints"]:
49-
endpoints.add(endpoint)
50+
ep_config = endpoint_configs.get(endpoint, {})
51+
if ep_config.get("enabled", True):
52+
endpoints.add(endpoint)
5053

5154
result = sorted(endpoints)
5255

‎.github/actions/get-job-parameters/action.yml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,15 @@ inputs:
1212
required: false
1313
default: "all"
1414
runner-type:
15-
description: "What type of CI runner are the jobs for (github or self-hosted)?"
16-
required: true
15+
description: "Deprecated: ignored when capability-based config is used"
16+
required: false
17+
default: ""
1718
runner-tags:
18-
description: "Comma separated list of tags the runner has"
19+
description: "Deprecated: ignored when capability-based config is used"
1920
required: false
2021
default: ""
2122
runner-pool:
22-
description: "Which pool of self-hosted runners to use (e.g., 'kmr-cloud-1', 'aws-cloud-1')"
23+
description: "Which runner pool to use (e.g., 'aws-cloud-1')"
2324
required: false
2425
default: ""
2526
benchmark:
@@ -40,4 +41,4 @@ runs:
4041
- name: "Generate jobs list"
4142
id: generate-jobs
4243
shell: bash
43-
run: TOOLBOX_HOME=${{ inputs.toolbox-directory }} ${{ inputs.rickshaw-directory }}/util/generate-ci-jobs.py --runner-type "${{ inputs.runner-type }}" --runner-tags "${{ inputs.runner-tags }}" --runner-pool "${{ inputs.runner-pool }}" --userenv-filter "${{ inputs.userenv-filter }}" --runtime-env "github" --benchmark "${{ inputs.benchmark }}" --endpoint "${{ inputs.endpoint }}"
44+
run: TOOLBOX_HOME=${{ inputs.toolbox-directory }} ${{ inputs.rickshaw-directory }}/util/generate-ci-jobs.py --runner-pool "${{ inputs.runner-pool }}" --userenv-filter "${{ inputs.userenv-filter }}" --runtime-env "github" --benchmark "${{ inputs.benchmark }}" --endpoint "${{ inputs.endpoint }}"

‎.github/workflows/core-endpoint-crucible-ci.yaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,8 +150,6 @@ jobs:
150150
id: get-job-parameters
151151
uses: ./crucible-ci/.github/actions/get-job-parameters
152152
with:
153-
runner-type: "github"
154-
runner-tags: "k8s,kube,cpu-partitioning,remotehosts"
155153
runner-pool: ${{ inputs.runner_pool }}
156154
userenv-filter: ${{ inputs.userenv_filter }}
157155
endpoint: ${{ inputs.endpoint }}

‎.github/workflows/endpoint-crucible-ci.yaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,6 @@ jobs:
9292
id: get-job-parameters
9393
uses: ./crucible-ci/.github/actions/get-job-parameters
9494
with:
95-
runner-type: "github"
96-
runner-tags: "k8s,kube,cpu-partitioning,remotehosts"
9795
runner-pool: ${{ inputs.runner_pool }}
9896
userenv-filter: ${{ inputs.userenv_filter }}
9997
benchmark: ${{ inputs.benchmark }}

0 commit comments

Comments
 (0)