Limited the containers tested on, and skip git testing till Salt requirements fixed

This commit is contained in:
David Murphy 2024-11-25 19:01:19 -07:00
parent ba0a5f2759
commit 13e00e0bbc
No known key found for this signature in database
GPG key ID: 9D7724F37A7424D8
2 changed files with 13 additions and 60 deletions

View file

@ -180,51 +180,6 @@ jobs:
amazonlinux-2:
name: Amazon 2
if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
uses: ./.github/workflows/test-linux.yml
needs:
- lint
- generate-actions-workflow
with:
distro-slug: amazonlinux-2
display-name: Amazon 2
container-slug: systemd-amazonlinux-2
timeout: 20
instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "latest", "default"]'
amazonlinux-2023:
name: Amazon 2023
if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
uses: ./.github/workflows/test-linux.yml
needs:
- lint
- generate-actions-workflow
with:
distro-slug: amazonlinux-2023
display-name: Amazon 2023
container-slug: systemd-amazonlinux-2023
timeout: 20
instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "latest", "default"]'
debian-11:
name: Debian 11
if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
uses: ./.github/workflows/test-linux.yml
needs:
- lint
- generate-actions-workflow
with:
distro-slug: debian-11
display-name: Debian 11
container-slug: systemd-debian-11
timeout: 20
instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "latest", "default"]'
debian-12: debian-12:
name: Debian 12 name: Debian 12
if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true' if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
@ -237,7 +192,7 @@ jobs:
display-name: Debian 12 display-name: Debian 12
container-slug: systemd-debian-12 container-slug: systemd-debian-12
timeout: 20 timeout: 20
instances: '["stable-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]' instances: '["stable-3007", "onedir-3007", "stable-3007-1", "latest", "default"]'
photon-5: photon-5:
@ -282,7 +237,7 @@ jobs:
display-name: Rocky Linux 9 display-name: Rocky Linux 9
container-slug: systemd-rockylinux-9 container-slug: systemd-rockylinux-9
timeout: 20 timeout: 20
instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]' instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "latest", "default"]'
ubuntu-2204: ubuntu-2204:
@ -312,9 +267,6 @@ jobs:
- macos-13 - macos-13
- macos-14 - macos-14
- windows-2022 - windows-2022
- amazonlinux-2
- amazonlinux-2023
- debian-11
- debian-12 - debian-12
- photon-5 - photon-5
- rockylinux-8 - rockylinux-8

View file

@ -8,6 +8,9 @@ os.chdir(os.path.abspath(os.path.dirname(__file__)))
# only test against current containers with systemd # only test against current containers with systemd
# will add these when they become available with systemd # will add these when they become available with systemd
# "amazonlinux-2",
# "amazonlinux-2023",
# "debian-11",
# "debian-12", # "debian-12",
# "debian-13", # "debian-13",
# "fedora-40", # "fedora-40",
@ -15,9 +18,6 @@ os.chdir(os.path.abspath(os.path.dirname(__file__)))
# "ubuntu-2004", # "ubuntu-2004",
# "ubuntu-2404", # "ubuntu-2404",
LINUX_DISTROS = [ LINUX_DISTROS = [
"amazonlinux-2",
"amazonlinux-2023",
"debian-11",
"debian-12", "debian-12",
"photon-5", "photon-5",
"rockylinux-8", "rockylinux-8",
@ -37,15 +37,15 @@ OSX = [
# only test against current containers with systemd # only test against current containers with systemd
# will add these when they become available with systemd # will add these when they become available with systemd
# "amazonlinux-2",
# "amazonlinux-2023",
# "debian-11",
# "debian-13", # "debian-13",
# "fedora-40", # "fedora-40",
# "photon-4", # "photon-4",
# "ubuntu-2004", # "ubuntu-2004",
# "ubuntu-2404", # "ubuntu-2404",
STABLE_DISTROS = [ STABLE_DISTROS = [
"amazonlinux-2",
"amazonlinux-2023",
"debian-11",
"debian-12", "debian-12",
"photon-5", "photon-5",
"rockylinux-8", "rockylinux-8",
@ -55,15 +55,15 @@ STABLE_DISTROS = [
# only test against current containers with systemd # only test against current containers with systemd
# will add these when they become available with systemd # will add these when they become available with systemd
# "amazonlinux-2",
# "amazonlinux-2023",
# "debian-11",
# "debian-13", # "debian-13",
# "fedora-40", # "fedora-40",
# "photon-4", # "photon-4",
# "ubuntu-2004", # "ubuntu-2004",
# "ubuntu-2404", # "ubuntu-2404",
ONEDIR_DISTROS = [ ONEDIR_DISTROS = [
"amazonlinux-2",
"amazonlinux-2023",
"debian-11",
"debian-12", "debian-12",
"photon-5", "photon-5",
"rockylinux-8", "rockylinux-8",
@ -126,15 +126,16 @@ BLACKLIST_GIT_3007 = [
"ubuntu-2404", "ubuntu-2404",
] ]
## "rockylinux-9",
BLACKLIST_GIT_MASTER = [ BLACKLIST_GIT_MASTER = [
"amazonlinux-2", "amazonlinux-2",
"amazonlinux-2023", "amazonlinux-2023",
"debian-11", "debian-11",
"debian-12",
"debian-13", "debian-13",
"fedora-40", "fedora-40",
"photon-4", "photon-4",
"photon-5", "photon-5",
"rockylinux-9",
] ]
SALT_VERSIONS = [ SALT_VERSIONS = [