saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Try matrix without include

Browse source
This commit is contained in:
Daniel A. Wozniak 2024-12-05 13:43:18 -07:00 • committed by Daniel Wozniak
parent ff846d1750
commit 971f3f188d
2 changed files with 13 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
.github/workflows/test-action.yml vendored
View file

@ -66,7 +66,7 @@ env:
jobs:
test-linux:
name: ${{ matrix.display_name }} ${{ matrix.tests-chunk }} ${{ matrix.transport }}
name: ${{ matrix.display_name }} ${{ matrix.tests-chunk }} ${{ matrix.transport }} ${{ matrix.fips && '--fips ' || '' }}
if: ${{ fromJSON(inputs.matrix)['linux'] != '[]' }}
runs-on:
- ${{ matrix.arch == 'x86_64' && 'ubuntu-22.04' || 'linux-arm64' }}
@ -77,8 +77,7 @@ jobs:
timeout-minutes: ${{ fromJSON(inputs.testrun)['type'] == 'full' && inputs.default-timeout || 360 }}
strategy:
fail-fast: false
matrix:
include: ${{ fromJSON(inputs.matrix)['linux'] }}
matrix: ${{ fromJSON(inputs.matrix)['linux'] }}
env:
SALT_TRANSPORT: ${{ matrix.transport }}
@ -176,7 +175,7 @@ jobs:
COVERAGE_CONTEXT: ${{ matrix.slug }}
run: |
nox --force-color -e ${{ inputs.nox-session }} -- ${{ matrix.tests-chunk }} -- \
-k "mac or darwin" --core-tests --slow-tests --suppress-no-test-exit-code \
--core-tests --slow-tests --suppress-no-test-exit-code \
--from-filenames=testrun-changed-files.txt
- name: Run Fast Tests
@ -194,7 +193,7 @@ jobs:
COVERAGE_CONTEXT: ${{ matrix.slug }}
run: |
nox --force-color -e ${{ inputs.nox-session }} -- ${{ matrix.tests-chunk }} -- \
-k "mac or darwin" --suppress-no-test-exit-code
--suppress-no-test-exit-code
- name: Run Slow Tests
id: run-slow-tests
@ -211,7 +210,7 @@ jobs:
COVERAGE_CONTEXT: ${{ matrix.slug }}
run: |
nox --force-color -e ${{ inputs.nox-session }} -- ${{ matrix.tests-chunk }} -- \
-k "mac or darwin" --suppress-no-test-exit-code --no-fast-tests --slow-tests
--suppress-no-test-exit-code --no-fast-tests --slow-tests
- name: Run Core Tests
id: run-core-tests
@ -228,7 +227,7 @@ jobs:
COVERAGE_CONTEXT: ${{ matrix.slug }}
run: |
nox --force-color -e ${{ inputs.nox-session }} -- ${{ matrix.tests-chunk }} -- \
-k "mac or darwin" --suppress-no-test-exit-code --no-fast-tests --core-tests
--suppress-no-test-exit-code --no-fast-tests --core-tests
- name: Run Flaky Tests
id: run-flaky-tests
@ -245,7 +244,7 @@ jobs:
COVERAGE_CONTEXT: ${{ matrix.slug }}
run: |
nox --force-color -e ${{ inputs.nox-session }} -- ${{ matrix.tests-chunk }} -- \
-k "mac or darwin" --suppress-no-test-exit-code --no-fast-tests --flaky-jail
--suppress-no-test-exit-code --no-fast-tests --flaky-jail
- name: Run Full Tests
id: run-full-tests
@ -262,7 +261,7 @@ jobs:
COVERAGE_CONTEXT: ${{ matrix.slug }}
run: |
nox --force-color -e ${{ inputs.nox-session }} -- ${{ matrix.tests-chunk }} -- \
--slow-tests --core-tests -k "mac or darwin"
--slow-tests --core-tests
- name: Fix file ownership
run: |
@ -321,8 +320,7 @@ jobs:
timeout-minutes: ${{ fromJSON(inputs.testrun)['type'] == 'full' && inputs.default-timeout || 360 }}
strategy:
fail-fast: false
matrix:
include: ${{ fromJSON(inputs.matrix)['macos'] }}
matrix: ${{ fromJSON(inputs.matrix)['macos'] }}
env:
SALT_TRANSPORT: ${{ matrix.transport }}
@ -555,8 +553,7 @@ jobs:
timeout-minutes: ${{ fromJSON(inputs.testrun)['type'] == 'full' && inputs.default-timeout || 360 }}
strategy:
fail-fast: false
matrix:
include: ${{ fromJSON(inputs.matrix)['windows'] }}
matrix: ${{ fromJSON(inputs.matrix)['windows'] }}
env:
SALT_TRANSPORT: ${{ matrix.transport }}

11
.github/workflows/test-packages-action.yml vendored
View file

@ -67,9 +67,7 @@ jobs:
timeout-minutes: 120 # 2 Hours - More than this and something is wrong
strategy:
fail-fast: false
matrix:
include: ${{ fromJSON(inputs.matrix)['linux'] }}
matrix: ${{ fromJSON(inputs.matrix)['linux'] }}
steps:
- name: "Throttle Builds"
@ -191,9 +189,7 @@ jobs:
timeout-minutes: 150 # 2 & 1/2 Hours - More than this and something is wrong (MacOS needs a little more time)
strategy:
fail-fast: false
matrix:
include: ${{ fromJSON(inputs.matrix)['macos'] }}
matrix: ${{ fromJSON(inputs.matrix)['macos'] }}
steps:
- name: "Throttle Builds"
@ -309,8 +305,7 @@ jobs:
timeout-minutes: 120 # 2 Hours - More than this and something is wrong
strategy:
fail-fast: false
matrix:
include: ${{ fromJSON(inputs.matrix)['linux'] }}
matrix: ${{ fromJSON(inputs.matrix)['linux'] }}
steps: