From daa96bdb20caaed30bea54fcc5a55f9501cb7aa8 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Thu, 29 Jun 2023 14:48:51 +0200 Subject: [PATCH] beaker/basic: Make CI runner configureable This will enable us to switch to other runners, for example external ones or bigger github hosted runners. --- .github/workflows/basic.yml | 7 ++++++- .github/workflows/beaker.yml | 14 ++++++++++++-- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/.github/workflows/basic.yml b/.github/workflows/basic.yml index 0e288f2..5b44ff7 100644 --- a/.github/workflows/basic.yml +++ b/.github/workflows/basic.yml @@ -29,6 +29,11 @@ on: default: '' required: false type: string + unit_runs_on: + description: the runner group used for unit jobs run on + default: ubuntu-latest + required: false + type: string jobs: setup_matrix: @@ -70,7 +75,7 @@ jobs: run: working-directory: ${{ inputs.working-directory }} needs: setup_matrix - runs-on: ubuntu-latest + runs-on: ${{ inputs.unit_runs_on }} timeout-minutes: ${{ inputs.timeout_minutes }} strategy: fail-fast: false diff --git a/.github/workflows/beaker.yml b/.github/workflows/beaker.yml index 9d65164..26ccc21 100644 --- a/.github/workflows/beaker.yml +++ b/.github/workflows/beaker.yml @@ -44,6 +44,16 @@ on: default: "example.com" required: false type: string + unit_runs_on: + description: the runner group used for unit jobs run on + default: ubuntu-latest + required: false + type: string + acceptance_runs_on: + description: the runner group used for acceptance jobs run on + default: ubuntu-20.04 + required: false + type: string jobs: setup_matrix: @@ -85,7 +95,7 @@ jobs: run: working-directory: ${{ inputs.working-directory }} needs: setup_matrix - runs-on: ubuntu-latest + runs-on: ${{ inputs.unit_runs_on }} timeout-minutes: ${{ inputs.timeout_minutes }} strategy: fail-fast: false @@ -115,7 +125,7 @@ jobs: run: working-directory: ${{ inputs.working-directory }} needs: setup_matrix - runs-on: ubuntu-20.04 + runs-on: ${{ inputs.acceptance_runs_on }} env: BUNDLE_WITHOUT: development:test:release strategy: