mirror of
https://github.com/saltstack/salt-bootstrap.git
synced 2025-04-17 10:10:25 +00:00
Do not run git-master on Photon 4
This commit is contained in:
parent
442cb1b180
commit
399d27b623
2 changed files with 7 additions and 2 deletions
2
.github/workflows/ci.yml
vendored
2
.github/workflows/ci.yml
vendored
|
@ -515,7 +515,7 @@ jobs:
|
|||
distro-slug: photon-4
|
||||
display-name: Photon OS 4
|
||||
timeout: 20
|
||||
instances: '["stable-3006", "onedir-3006", "git-master", "latest"]'
|
||||
instances: '["stable-3006", "onedir-3006", "latest"]'
|
||||
|
||||
|
||||
rockylinux-8:
|
||||
|
|
7
.github/workflows/templates/generate.py
vendored
7
.github/workflows/templates/generate.py
vendored
|
@ -255,6 +255,10 @@ BLACKLIST_GIT_3006 = [
|
|||
"ubuntu-2204",
|
||||
]
|
||||
|
||||
BLACKLIST_GIT_MASTER = [
|
||||
"photon-4",
|
||||
]
|
||||
|
||||
SALT_VERSIONS = [
|
||||
"3003",
|
||||
"3004",
|
||||
|
@ -597,6 +601,7 @@ def generate_test_jobs():
|
|||
"3004": BLACKLIST_GIT_3004,
|
||||
"3005": BLACKLIST_GIT_3005,
|
||||
"3006": BLACKLIST_GIT_3006,
|
||||
"master": BLACKLIST_GIT_MASTER,
|
||||
}
|
||||
|
||||
# .0 versions are a virtual version for pinning to the first
|
||||
|
@ -606,7 +611,7 @@ def generate_test_jobs():
|
|||
continue
|
||||
|
||||
if (
|
||||
salt_version in ("3003", "3004", "3005", "3006")
|
||||
salt_version in ("3003", "3004", "3005", "3006", "master")
|
||||
and distro in BLACKLIST[salt_version]
|
||||
):
|
||||
continue
|
||||
|
|
Loading…
Add table
Reference in a new issue