diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index 68c85478962b..77a38eb193fe 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -4,13 +4,14 @@ on: matrix: required: true type: string - runner: + runnersByArch: type: string - required: true + required: false + default: '{"amd64": "ubuntu-latest", "arm64": "ubuntu-latest-arm64-kong"}' permissions: contents: read env: - CI_TOOLS_DIR: ${{ contains(inputs.runner, '-kong') && '/work/kuma/kuma/.ci_tools' || '/home/runner/work/kuma/kuma/.ci_tools' }} + CI_TOOLS_DIR: ${{ contains(fromJSON(inputs.runnersByArch)[fromJSON(inputs.matrix).arch], '-kong') && '/work/kuma/kuma/.ci_tools' || '/home/runner/work/kuma/kuma/.ci_tools' }} E2E_PARAM_K8S_VERSION: ${{ fromJSON(inputs.matrix).k8sVersion }} E2E_PARAM_CNI_NETWORK_PLUGIN: ${{ fromJSON(inputs.matrix).cniNetworkPlugin }} E2E_PARAM_ARCH: ${{ fromJSON(inputs.matrix).arch }} @@ -21,8 +22,8 @@ jobs: e2e: timeout-minutes: 60 # can't use env vars here - runs-on: ${{ inputs.runner }} - if: ${{ inputs.runner != '' }} + runs-on: ${{ fromJSON(inputs.runnersByArch)[fromJSON(inputs.matrix).arch] }} + if: ${{ fromJSON(inputs.runnersByArch)[fromJSON(inputs.matrix).arch] != '' }} strategy: fail-fast: false matrix: