mirror of
https://github.com/saltstack/salt.git
synced 2025-04-16 17:50:20 +00:00
Need to work out mandatory OSes and defined jobs
This commit is contained in:
Daniel A. Wozniak
Daniel Wozniak
parent
a26ffafd46
commit
b5ceeef2c0
3 changed files with 28 additions and 26 deletions
50
.github/workflows/ci.yml
vendored
50
.github/workflows/ci.yml
vendored
|
|
@ -1338,7 +1338,7 @@ jobs:
|
|||
|
||||
test-rockylinux-8:
|
||||
name: Rocky Linux 8 Test
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-rockylinux-8'] && contains(fromJSON(needs.prepare-workflow.outputs.os-labels), 'rockylinux-8') }}
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-rockylinux-8'] }}
|
||||
needs:
|
||||
- prepare-workflow
|
||||
- build-ci-deps-linux
|
||||
|
|
@ -1360,7 +1360,7 @@ jobs:
|
|||
|
||||
test-rockylinux-8-arm64:
|
||||
name: Rocky Linux 8 Arm64 Test
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-rockylinux-8-arm64'] && contains(fromJSON(needs.prepare-workflow.outputs.os-labels), 'rockylinux-8-arm64') }}
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-rockylinux-8-arm64'] }}
|
||||
needs:
|
||||
- prepare-workflow
|
||||
- build-ci-deps-linux
|
||||
|
|
@ -1382,7 +1382,7 @@ jobs:
|
|||
|
||||
test-rockylinux-9:
|
||||
name: Rocky Linux 9 Test
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-rockylinux-9'] && contains(fromJSON(needs.prepare-workflow.outputs.os-labels), 'rockylinux-9') }}
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-rockylinux-9'] }}
|
||||
needs:
|
||||
- prepare-workflow
|
||||
- build-ci-deps-linux
|
||||
|
|
@ -1404,7 +1404,7 @@ jobs:
|
|||
|
||||
test-rockylinux-9-arm64:
|
||||
name: Rocky Linux 9 Arm64 Test
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-rockylinux-9-arm64'] && contains(fromJSON(needs.prepare-workflow.outputs.os-labels), 'rockylinux-9-arm64') }}
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-rockylinux-9-arm64'] }}
|
||||
needs:
|
||||
- prepare-workflow
|
||||
- build-ci-deps-linux
|
||||
|
|
@ -1426,7 +1426,7 @@ jobs:
|
|||
|
||||
test-amazonlinux-2:
|
||||
name: Amazon Linux 2 Test
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-amazonlinux-2'] && contains(fromJSON(needs.prepare-workflow.outputs.os-labels), 'amazonlinux-2') }}
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-amazonlinux-2'] }}
|
||||
needs:
|
||||
- prepare-workflow
|
||||
- build-ci-deps-linux
|
||||
|
|
@ -1448,7 +1448,7 @@ jobs:
|
|||
|
||||
test-amazonlinux-2-arm64:
|
||||
name: Amazon Linux 2 Arm64 Test
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-amazonlinux-2-arm64'] && contains(fromJSON(needs.prepare-workflow.outputs.os-labels), 'amazonlinux-2-arm64') }}
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-amazonlinux-2-arm64'] }}
|
||||
needs:
|
||||
- prepare-workflow
|
||||
- build-ci-deps-linux
|
||||
|
|
@ -1470,7 +1470,7 @@ jobs:
|
|||
|
||||
test-amazonlinux-2023:
|
||||
name: Amazon Linux 2023 Test
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-amazonlinux-2023'] && contains(fromJSON(needs.prepare-workflow.outputs.os-labels), 'amazonlinux-2023') }}
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-amazonlinux-2023'] }}
|
||||
needs:
|
||||
- prepare-workflow
|
||||
- build-ci-deps-linux
|
||||
|
|
@ -1492,7 +1492,7 @@ jobs:
|
|||
|
||||
test-amazonlinux-2023-arm64:
|
||||
name: Amazon Linux 2023 Arm64 Test
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-amazonlinux-2023-arm64'] && contains(fromJSON(needs.prepare-workflow.outputs.os-labels), 'amazonlinux-2023-arm64') }}
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-amazonlinux-2023-arm64'] }}
|
||||
needs:
|
||||
- prepare-workflow
|
||||
- build-ci-deps-linux
|
||||
|
|
@ -1514,7 +1514,7 @@ jobs:
|
|||
|
||||
test-debian-11:
|
||||
name: Debian 11 Test
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-debian-11'] && contains(fromJSON(needs.prepare-workflow.outputs.os-labels), 'debian-11') }}
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-debian-11'] }}
|
||||
needs:
|
||||
- prepare-workflow
|
||||
- build-ci-deps-linux
|
||||
|
|
@ -1536,7 +1536,7 @@ jobs:
|
|||
|
||||
test-debian-11-arm64:
|
||||
name: Debian 11 Arm64 Test
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-debian-11-arm64'] && contains(fromJSON(needs.prepare-workflow.outputs.os-labels), 'debian-11-arm64') }}
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-debian-11-arm64'] }}
|
||||
needs:
|
||||
- prepare-workflow
|
||||
- build-ci-deps-linux
|
||||
|
|
@ -1558,7 +1558,7 @@ jobs:
|
|||
|
||||
test-debian-12:
|
||||
name: Debian 12 Test
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-debian-12'] && contains(fromJSON(needs.prepare-workflow.outputs.os-labels), 'debian-12') }}
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-debian-12'] }}
|
||||
needs:
|
||||
- prepare-workflow
|
||||
- build-ci-deps-linux
|
||||
|
|
@ -1580,7 +1580,7 @@ jobs:
|
|||
|
||||
test-debian-12-arm64:
|
||||
name: Debian 12 Arm64 Test
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-debian-12-arm64'] && contains(fromJSON(needs.prepare-workflow.outputs.os-labels), 'debian-12-arm64') }}
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-debian-12-arm64'] }}
|
||||
needs:
|
||||
- prepare-workflow
|
||||
- build-ci-deps-linux
|
||||
|
|
@ -1602,7 +1602,7 @@ jobs:
|
|||
|
||||
test-fedora-40:
|
||||
name: Fedora 40 Test
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-fedora-40'] && contains(fromJSON(needs.prepare-workflow.outputs.os-labels), 'fedora-40') }}
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-fedora-40'] }}
|
||||
needs:
|
||||
- prepare-workflow
|
||||
- build-ci-deps-linux
|
||||
|
|
@ -1624,7 +1624,7 @@ jobs:
|
|||
|
||||
test-photonos-4:
|
||||
name: Photon OS 4 Test
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-photonos-4'] && contains(fromJSON(needs.prepare-workflow.outputs.os-labels), 'photonos-4') }}
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-photonos-4'] }}
|
||||
needs:
|
||||
- prepare-workflow
|
||||
- build-ci-deps-linux
|
||||
|
|
@ -1646,7 +1646,7 @@ jobs:
|
|||
|
||||
test-photonos-4-arm64:
|
||||
name: Photon OS 4 Arm64 Test
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-photonos-4-arm64'] && contains(fromJSON(needs.prepare-workflow.outputs.os-labels), 'photonos-4-arm64') }}
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-photonos-4-arm64'] }}
|
||||
needs:
|
||||
- prepare-workflow
|
||||
- build-ci-deps-linux
|
||||
|
|
@ -1668,7 +1668,7 @@ jobs:
|
|||
|
||||
test-photonos-4-fips:
|
||||
name: Photon OS 4 Test (fips)
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-photonos-4-fips'] && contains(fromJSON(needs.prepare-workflow.outputs.os-labels), 'photonos-4') }}
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-photonos-4-fips'] }}
|
||||
needs:
|
||||
- prepare-workflow
|
||||
- build-ci-deps-linux
|
||||
|
|
@ -1691,7 +1691,7 @@ jobs:
|
|||
|
||||
test-photonos-4-arm64-fips:
|
||||
name: Photon OS 4 Arm64 Test (fips)
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-photonos-4-arm64-fips'] && contains(fromJSON(needs.prepare-workflow.outputs.os-labels), 'photonos-4-arm64') }}
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-photonos-4-arm64-fips'] }}
|
||||
needs:
|
||||
- prepare-workflow
|
||||
- build-ci-deps-linux
|
||||
|
|
@ -1714,7 +1714,7 @@ jobs:
|
|||
|
||||
test-photonos-5:
|
||||
name: Photon OS 5 Test
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-photonos-5'] && contains(fromJSON(needs.prepare-workflow.outputs.os-labels), 'photonos-5') }}
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-photonos-5'] }}
|
||||
needs:
|
||||
- prepare-workflow
|
||||
- build-ci-deps-linux
|
||||
|
|
@ -1736,7 +1736,7 @@ jobs:
|
|||
|
||||
test-photonos-5-arm64:
|
||||
name: Photon OS 5 Arm64 Test
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-photonos-5-arm64'] && contains(fromJSON(needs.prepare-workflow.outputs.os-labels), 'photonos-5-arm64') }}
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-photonos-5-arm64'] }}
|
||||
needs:
|
||||
- prepare-workflow
|
||||
- build-ci-deps-linux
|
||||
|
|
@ -1758,7 +1758,7 @@ jobs:
|
|||
|
||||
test-photonos-5-fips:
|
||||
name: Photon OS 5 Test (fips)
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-photonos-5-fips'] && contains(fromJSON(needs.prepare-workflow.outputs.os-labels), 'photonos-5') }}
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-photonos-5-fips'] }}
|
||||
needs:
|
||||
- prepare-workflow
|
||||
- build-ci-deps-linux
|
||||
|
|
@ -1781,7 +1781,7 @@ jobs:
|
|||
|
||||
test-photonos-5-arm64-fips:
|
||||
name: Photon OS 5 Arm64 Test (fips)
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-photonos-5-arm64-fips'] && contains(fromJSON(needs.prepare-workflow.outputs.os-labels), 'photonos-5-arm64') }}
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-photonos-5-arm64-fips'] }}
|
||||
needs:
|
||||
- prepare-workflow
|
||||
- build-ci-deps-linux
|
||||
|
|
@ -1804,7 +1804,7 @@ jobs:
|
|||
|
||||
test-ubuntu-2004:
|
||||
name: Ubuntu 20.04 Test
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-ubuntu-2004'] && contains(fromJSON(needs.prepare-workflow.outputs.os-labels), 'ubuntu-20.04') }}
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-ubuntu-2004'] }}
|
||||
needs:
|
||||
- prepare-workflow
|
||||
- build-ci-deps-linux
|
||||
|
|
@ -1826,7 +1826,7 @@ jobs:
|
|||
|
||||
test-ubuntu-2004-arm64:
|
||||
name: Ubuntu 20.04 Arm64 Test
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-ubuntu-2004-arm64'] && contains(fromJSON(needs.prepare-workflow.outputs.os-labels), 'ubuntu-20.04-arm64') }}
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-ubuntu-2004-arm64'] }}
|
||||
needs:
|
||||
- prepare-workflow
|
||||
- build-ci-deps-linux
|
||||
|
|
@ -1892,7 +1892,7 @@ jobs:
|
|||
|
||||
test-ubuntu-2404:
|
||||
name: Ubuntu 24.04 Test
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-ubuntu-2404'] && contains(fromJSON(needs.prepare-workflow.outputs.os-labels), 'ubuntu-24.04') }}
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-ubuntu-2404'] }}
|
||||
needs:
|
||||
- prepare-workflow
|
||||
- build-ci-deps-linux
|
||||
|
|
@ -1914,7 +1914,7 @@ jobs:
|
|||
|
||||
test-ubuntu-2404-arm64:
|
||||
name: Ubuntu 24.04 Arm64 Test
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-ubuntu-2404-arm64'] && contains(fromJSON(needs.prepare-workflow.outputs.os-labels), 'ubuntu-24.04-arm64') }}
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-ubuntu-2404-arm64'] }}
|
||||
needs:
|
||||
- prepare-workflow
|
||||
- build-ci-deps-linux
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@
|
|||
<{ job_name }>:
|
||||
<%- do test_salt_needs.append(job_name) %>
|
||||
name: <{ os.display_name }> Test<%- if os.fips %> (fips)<%- endif %>
|
||||
<%- if workflow_slug != "ci" or os.slug in mandatory_os_slugs %>
|
||||
<%- if workflow_slug != "ci" or os.slug in mandatory_os_slugs or True%>
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['<{ job_name }>'] }}
|
||||
<%- else %>
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['<{ job_name }>'] && contains(fromJSON(needs.prepare-workflow.outputs.os-labels), '<{ os.slug }>') }}
|
||||
|
|
|
|||
|
|
@ -1570,6 +1570,7 @@ def workflow_config(
|
|||
jobs.update({_.job_name: True for _ in TEST_SALT_LISTING[kind]}) # type: ignore
|
||||
|
||||
if skip_tests:
|
||||
ctx.print("Skipping test jobs")
|
||||
jobs["test"] = False
|
||||
for kind in kinds:
|
||||
jobs.update({_.job_name: False for _ in TEST_SALT_LISTING[kind]}) # type: ignore
|
||||
|
|
@ -1578,6 +1579,7 @@ def workflow_config(
|
|||
jobs.update({_.job_name: True for _ in TEST_SALT_PKG_LISTING[kind]}) # type: ignore
|
||||
|
||||
if skip_pkg_tests:
|
||||
ctx.print("Skipping package test jobs")
|
||||
jobs["test-pkg"] = False
|
||||
for kind in kinds:
|
||||
jobs.update({_.job_name: False for _ in TEST_SALT_PKG_LISTING[kind]}) # type: ignore
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue