mirror of
https://github.com/saltstack/salt.git
synced 2025-04-16 17:50:20 +00:00
Make linux_arm_runner required
This commit is contained in:
parent
ca4b04b730
commit
23785aecc5
11 changed files with 17 additions and 17 deletions
5
.github/workflows/build-deps-ci-action.yml
vendored
5
.github/workflows/build-deps-ci-action.yml
vendored
|
@ -39,8 +39,7 @@ on:
|
|||
type: string
|
||||
description: Json job matrix config
|
||||
linux_arm_runner:
|
||||
required: false
|
||||
default: ""
|
||||
required: true
|
||||
type: string
|
||||
description: Json job matrix config
|
||||
|
||||
|
@ -61,7 +60,7 @@ jobs:
|
|||
name: Linux
|
||||
if: ${{ toJSON(fromJSON(inputs.matrix)['linux']) != '[]' }}
|
||||
runs-on:
|
||||
- ${{ matrix.arch == 'x86_64' && 'ubuntu-latest' || inputs.linux_arm_runner }}
|
||||
- ${{ matrix.arch == 'x86_64' && 'ubuntu-22.04' || inputs.linux_arm_runner }}
|
||||
env:
|
||||
USE_S3_CACHE: 'false'
|
||||
timeout-minutes: 90
|
||||
|
|
3
.github/workflows/build-deps-onedir.yml
vendored
3
.github/workflows/build-deps-onedir.yml
vendored
|
@ -25,8 +25,7 @@ on:
|
|||
type: string
|
||||
description: Json job matrix config
|
||||
linux_arm_runner:
|
||||
required: false
|
||||
default: ""
|
||||
required: true
|
||||
type: string
|
||||
description: Json job matrix config
|
||||
|
||||
|
|
3
.github/workflows/build-packages.yml
vendored
3
.github/workflows/build-packages.yml
vendored
|
@ -41,8 +41,7 @@ on:
|
|||
type: string
|
||||
description: Json job matrix config
|
||||
linux_arm_runner:
|
||||
required: false
|
||||
default: ""
|
||||
required: true
|
||||
type: string
|
||||
description: Json job matrix config
|
||||
|
||||
|
|
3
.github/workflows/build-salt-onedir.yml
vendored
3
.github/workflows/build-salt-onedir.yml
vendored
|
@ -25,8 +25,7 @@ on:
|
|||
required: true
|
||||
description: Json config for build matrix
|
||||
linux_arm_runner:
|
||||
required: false
|
||||
default: ""
|
||||
required: true
|
||||
type: string
|
||||
description: Json job matrix config
|
||||
|
||||
|
|
1
.github/workflows/ci.yml
vendored
1
.github/workflows/ci.yml
vendored
|
@ -486,6 +486,7 @@ jobs:
|
|||
skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
|
||||
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
|
||||
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['pkg-test-matrix']) }}
|
||||
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
|
||||
test:
|
||||
name: Test Salt
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test'] }}
|
||||
|
|
1
.github/workflows/nightly.yml
vendored
1
.github/workflows/nightly.yml
vendored
|
@ -564,6 +564,7 @@ jobs:
|
|||
skip-code-coverage: true
|
||||
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
|
||||
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['pkg-test-matrix']) }}
|
||||
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
|
||||
test:
|
||||
name: Test Salt
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test'] }}
|
||||
|
|
1
.github/workflows/scheduled.yml
vendored
1
.github/workflows/scheduled.yml
vendored
|
@ -525,6 +525,7 @@ jobs:
|
|||
skip-code-coverage: true
|
||||
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
|
||||
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['pkg-test-matrix']) }}
|
||||
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
|
||||
test:
|
||||
name: Test Salt
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test'] }}
|
||||
|
|
1
.github/workflows/staging.yml
vendored
1
.github/workflows/staging.yml
vendored
|
@ -550,6 +550,7 @@ jobs:
|
|||
skip-code-coverage: true
|
||||
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
|
||||
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['pkg-test-matrix']) }}
|
||||
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
|
||||
test:
|
||||
name: Test Salt
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test'] }}
|
||||
|
|
|
@ -16,3 +16,4 @@
|
|||
skip-code-coverage: <{ skip_test_coverage_check }>
|
||||
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
|
||||
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['pkg-test-matrix']) }}
|
||||
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
|
||||
|
|
9
.github/workflows/test-action.yml
vendored
9
.github/workflows/test-action.yml
vendored
|
@ -54,8 +54,7 @@ on:
|
|||
type: string
|
||||
description: Json job matrix config
|
||||
linux_arm_runner:
|
||||
required: false
|
||||
default: ""
|
||||
required: true
|
||||
type: string
|
||||
description: Json job matrix config
|
||||
|
||||
|
@ -71,10 +70,8 @@ jobs:
|
|||
|
||||
test-linux:
|
||||
name: ${{ matrix.display_name }} ${{ matrix.tests-chunk }} ${{ matrix.transport }}${{ matrix.fips && '(fips)' || '' }}${{ matrix.test-group && ' ' || '' }}${{ matrix.test-group && matrix.test-group || '' }}
|
||||
|
||||
runs-on: ${{ matrix.arch == 'x86_64' && 'ubuntu-22.04' || inputs.linux_arm_runner }}
|
||||
if: ${{ toJSON(fromJSON(inputs.matrix)['linux']) != '[]' }}
|
||||
runs-on:
|
||||
- ${{ matrix.arch == 'x86_64' && 'ubuntu-22.04' || inputs.linux_arm_runner }}
|
||||
# Full test runs. Each chunk should never take more than 2 hours.
|
||||
# Partial test runs(no chunk parallelization), 6 Hours
|
||||
timeout-minutes: ${{ fromJSON(inputs.testrun)['type'] == 'full' && inputs.default-timeout || 360 }}
|
||||
|
@ -82,7 +79,6 @@ jobs:
|
|||
fail-fast: false
|
||||
matrix:
|
||||
include: ${{ fromJSON(inputs.matrix)['linux'] }}
|
||||
|
||||
steps:
|
||||
- name: Set up Python ${{ inputs.python-version }}
|
||||
uses: actions/setup-python@v5
|
||||
|
@ -390,7 +386,6 @@ jobs:
|
|||
|
||||
test-macos:
|
||||
name: ${{ matrix.display_name }} ${{ matrix.tests-chunk }} ${{ matrix.transport }}${{ matrix.test-group && ' ' || '' }}${{ matrix.test-group && matrix.test-group || '' }}
|
||||
|
||||
runs-on: ${{ matrix.runner }}
|
||||
# Full test runs. Each chunk should never take more than 2 hours.
|
||||
# Partial test runs(no chunk parallelization), 6 Hours
|
||||
|
|
6
.github/workflows/test-packages-action.yml
vendored
6
.github/workflows/test-packages-action.yml
vendored
|
@ -44,6 +44,10 @@ on:
|
|||
required: true
|
||||
type: string
|
||||
description: Json job matrix config
|
||||
linux_arm_runner:
|
||||
required: true
|
||||
type: string
|
||||
description: Json job matrix config
|
||||
|
||||
env:
|
||||
COLUMNS: 190
|
||||
|
@ -61,7 +65,7 @@ jobs:
|
|||
test-linux:
|
||||
name: ${{ matrix.display_name }} ${{ matrix.tests-chunk }}
|
||||
runs-on:
|
||||
- ${{ matrix.arch == 'x86_64' && 'ubuntu-22.04' || 'linux-arm64' }}
|
||||
- ${{ matrix.arch == 'x86_64' && 'ubuntu-22.04' || inputs.linux_arm_runner }}
|
||||
if: ${{ toJSON(fromJSON(inputs.matrix)['linux']) != '[]' }}
|
||||
timeout-minutes: 120 # 2 Hours - More than this and something is wrong
|
||||
strategy:
|
||||
|
|
Loading…
Add table
Reference in a new issue