diff --git a/.changeset/storyboard-runner-variable.md b/.changeset/storyboard-runner-variable.md new file mode 100644 index 00000000000..9a3db971330 --- /dev/null +++ b/.changeset/storyboard-runner-variable.md @@ -0,0 +1,5 @@ +--- +"adcontextprotocol": patch +--- + +Let the `STORYBOARD_RUNNER` repository variable choose the runner for the training-agent storyboard and sales orchestrator CI matrices, falling back to `ubuntu-latest` when unset. Storyboard selection, floors and results are unchanged. diff --git a/.github/workflows/training-agent-storyboards.yml b/.github/workflows/training-agent-storyboards.yml index b4f1a47bafc..8b17455bf9b 100644 --- a/.github/workflows/training-agent-storyboards.yml +++ b/.github/workflows/training-agent-storyboards.yml @@ -57,7 +57,12 @@ jobs: name: Storyboards (${{ matrix.surface }} /${{ matrix.tenant }}) # Skip draft PRs; push events have no pull_request payload and always run. if: github.event.pull_request.draft != true - runs-on: ubuntu-latest + # The storyboard matrix is about half of the repo's runner-minutes. Set the + # STORYBOARD_RUNNER repository variable to a larger-runner label (for + # example ubuntu-latest-m) to move it off the shared hosted pool; unset, + # it stays on ubuntu-latest. Unset it again if the larger runner is shut + # down (e.g. by the Actions spending limit) so jobs never queue forever. + runs-on: ${{ vars.STORYBOARD_RUNNER || 'ubuntu-latest' }} timeout-minutes: 30 strategy: fail-fast: false @@ -545,7 +550,8 @@ jobs: sales_storyboard_orchestrators: name: Sales storyboard orchestrator (${{ matrix.orchestrator }}/8) if: github.event.pull_request.draft != true - runs-on: ubuntu-latest + # Same runner selection as the storyboards matrix above. + runs-on: ${{ vars.STORYBOARD_RUNNER || 'ubuntu-latest' }} timeout-minutes: 30 strategy: fail-fast: false diff --git a/tests/ci-runner-demand-workflows.test.mjs b/tests/ci-runner-demand-workflows.test.mjs index 28519c032f5..9fa922e0301 100644 --- a/tests/ci-runner-demand-workflows.test.mjs +++ b/tests/ci-runner-demand-workflows.test.mjs @@ -24,6 +24,20 @@ describe('training-agent-storyboards.yml draft skipping', () => { }); }); +describe('training-agent-storyboards.yml runner selection', () => { + const wf = load('training-agent-storyboards.yml'); + + it('runs the heavy matrices on STORYBOARD_RUNNER, falling back to ubuntu-latest', () => { + for (const id of ['storyboards', 'sales_storyboard_orchestrators']) { + expect(wf.jobs[id]['runs-on'], id).toBe("${{ vars.STORYBOARD_RUNNER || 'ubuntu-latest' }}"); + } + }); + + it('keeps the summary job on the standard hosted pool', () => { + expect(wf.jobs.sales_storyboards['runs-on']).toBe('ubuntu-latest'); + }); +}); + describe.each([ ['codeql.yml'], ['semgrep.yml'],