mirror of
https://github.com/saltstack/salt-bootstrap.git
synced 2025-04-17 10:10:25 +00:00
feat(generate): add onedir-nightly
generation => CI
This commit is contained in:
parent
ad8d9667b2
commit
3c3dba8a6d
2 changed files with 41 additions and 12 deletions
24
.github/workflows/ci.yml
vendored
24
.github/workflows/ci.yml
vendored
|
@ -249,7 +249,7 @@ jobs:
|
|||
distro-slug: almalinux-8
|
||||
display-name: AlmaLinux 8
|
||||
timeout: 20
|
||||
instances: '["stable-3003", "git-3003", "stable-3004", "git-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "latest"]'
|
||||
instances: '["stable-3003", "git-3003", "stable-3004", "git-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "latest", "onedir-nightly"]'
|
||||
|
||||
|
||||
amazon-2:
|
||||
|
@ -263,7 +263,7 @@ jobs:
|
|||
distro-slug: amazon-2
|
||||
display-name: Amazon 2
|
||||
timeout: 20
|
||||
instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "git-master", "latest"]'
|
||||
instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "git-master", "latest", "onedir-nightly"]'
|
||||
|
||||
|
||||
arch:
|
||||
|
@ -291,7 +291,7 @@ jobs:
|
|||
distro-slug: centos-7
|
||||
display-name: CentOS 7
|
||||
timeout: 20
|
||||
instances: '["stable-3003", "git-3003", "stable-3004", "git-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "latest"]'
|
||||
instances: '["stable-3003", "git-3003", "stable-3004", "git-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "latest", "onedir-nightly"]'
|
||||
|
||||
|
||||
centos-stream8:
|
||||
|
@ -305,7 +305,7 @@ jobs:
|
|||
distro-slug: centos-stream8
|
||||
display-name: CentOS Stream 8
|
||||
timeout: 20
|
||||
instances: '["stable-3003", "git-3003", "stable-3004", "git-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "latest"]'
|
||||
instances: '["stable-3003", "git-3003", "stable-3004", "git-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "latest", "onedir-nightly"]'
|
||||
|
||||
|
||||
debian-10:
|
||||
|
@ -319,7 +319,7 @@ jobs:
|
|||
distro-slug: debian-10
|
||||
display-name: Debian 10
|
||||
timeout: 20
|
||||
instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "git-master", "latest"]'
|
||||
instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "git-master", "latest", "onedir-nightly"]'
|
||||
|
||||
|
||||
debian-11:
|
||||
|
@ -333,7 +333,7 @@ jobs:
|
|||
distro-slug: debian-11
|
||||
display-name: Debian 11
|
||||
timeout: 20
|
||||
instances: '["stable-3004", "stable-3005", "onedir-3005", "git-master", "latest"]'
|
||||
instances: '["stable-3004", "stable-3005", "onedir-3005", "git-master", "latest", "onedir-nightly"]'
|
||||
|
||||
|
||||
fedora-35:
|
||||
|
@ -431,7 +431,7 @@ jobs:
|
|||
distro-slug: oraclelinux-7
|
||||
display-name: Oracle Linux 7
|
||||
timeout: 20
|
||||
instances: '["stable-3003", "git-3003", "stable-3004", "git-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "latest"]'
|
||||
instances: '["stable-3003", "git-3003", "stable-3004", "git-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "latest", "onedir-nightly"]'
|
||||
|
||||
|
||||
oraclelinux-8:
|
||||
|
@ -445,7 +445,7 @@ jobs:
|
|||
distro-slug: oraclelinux-8
|
||||
display-name: Oracle Linux 8
|
||||
timeout: 20
|
||||
instances: '["stable-3003", "git-3003", "stable-3004", "git-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "latest"]'
|
||||
instances: '["stable-3003", "git-3003", "stable-3004", "git-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "latest", "onedir-nightly"]'
|
||||
|
||||
|
||||
rockylinux-8:
|
||||
|
@ -459,7 +459,7 @@ jobs:
|
|||
distro-slug: rockylinux-8
|
||||
display-name: Rocky Linux 8
|
||||
timeout: 20
|
||||
instances: '["stable-3004", "git-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "latest"]'
|
||||
instances: '["stable-3004", "git-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "latest", "onedir-nightly"]'
|
||||
|
||||
|
||||
ubuntu-1804:
|
||||
|
@ -473,7 +473,7 @@ jobs:
|
|||
distro-slug: ubuntu-1804
|
||||
display-name: Ubuntu 18.04
|
||||
timeout: 20
|
||||
instances: '["stable-3003", "git-3003", "stable-3004", "git-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "latest"]'
|
||||
instances: '["stable-3003", "git-3003", "stable-3004", "git-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "latest", "onedir-nightly"]'
|
||||
|
||||
|
||||
ubuntu-2004:
|
||||
|
@ -487,7 +487,7 @@ jobs:
|
|||
distro-slug: ubuntu-2004
|
||||
display-name: Ubuntu 20.04
|
||||
timeout: 20
|
||||
instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "git-master", "latest"]'
|
||||
instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "git-master", "latest", "onedir-nightly"]'
|
||||
|
||||
|
||||
ubuntu-2204:
|
||||
|
@ -501,7 +501,7 @@ jobs:
|
|||
distro-slug: ubuntu-2204
|
||||
display-name: Ubuntu 22.04
|
||||
timeout: 20
|
||||
instances: '["stable-3004", "stable-3005", "onedir-3005", "git-master", "latest"]'
|
||||
instances: '["stable-3004", "stable-3005", "onedir-3005", "git-master", "latest", "onedir-nightly"]'
|
||||
|
||||
|
||||
set-pipeline-exit-status:
|
||||
|
|
29
.github/workflows/templates/generate.py
vendored
29
.github/workflows/templates/generate.py
vendored
|
@ -66,6 +66,21 @@ STABLE_DISTROS = [
|
|||
"ubuntu-2204",
|
||||
]
|
||||
|
||||
ONEDIR_DISTROS = [
|
||||
"almalinux-8",
|
||||
"amazon-2",
|
||||
"centos-7",
|
||||
"centos-stream8",
|
||||
"debian-10",
|
||||
"debian-11",
|
||||
"oraclelinux-7",
|
||||
"oraclelinux-8",
|
||||
"rockylinux-8",
|
||||
"ubuntu-1804",
|
||||
"ubuntu-2004",
|
||||
"ubuntu-2204",
|
||||
]
|
||||
|
||||
BLACKLIST_3003 = [
|
||||
"arch",
|
||||
"debian-11",
|
||||
|
@ -154,11 +169,13 @@ SALT_VERSIONS = [
|
|||
"3005",
|
||||
"master",
|
||||
"latest",
|
||||
"nightly",
|
||||
]
|
||||
|
||||
ONEDIR_SALT_VERSIONS = [
|
||||
"3005",
|
||||
"latest",
|
||||
"nightly",
|
||||
]
|
||||
|
||||
VERSION_DISPLAY_NAMES = {
|
||||
|
@ -167,10 +184,16 @@ VERSION_DISPLAY_NAMES = {
|
|||
"3005": "v3005",
|
||||
"master": "Master",
|
||||
"latest": "Latest",
|
||||
"nightly": "Nightly",
|
||||
}
|
||||
|
||||
STABLE_VERSION_BLACKLIST = [
|
||||
"master",
|
||||
"nightly",
|
||||
]
|
||||
|
||||
GIT_VERSION_BLACKLIST = [
|
||||
"nightly",
|
||||
]
|
||||
|
||||
LATEST_PKG_BLACKLIST = []
|
||||
|
@ -415,6 +438,8 @@ def generate_test_jobs():
|
|||
if bootstrap_type == "onedir":
|
||||
if salt_version not in ONEDIR_SALT_VERSIONS:
|
||||
continue
|
||||
if distro not in ONEDIR_DISTROS:
|
||||
continue
|
||||
|
||||
if bootstrap_type == "stable":
|
||||
if salt_version in STABLE_VERSION_BLACKLIST:
|
||||
|
@ -426,6 +451,10 @@ def generate_test_jobs():
|
|||
# Fedora does not keep old builds around
|
||||
continue
|
||||
|
||||
if bootstrap_type == "git":
|
||||
if salt_version in GIT_VERSION_BLACKLIST:
|
||||
continue
|
||||
|
||||
BLACKLIST = {
|
||||
"3003": BLACKLIST_3003,
|
||||
"3004": BLACKLIST_3004,
|
||||
|
|
Loading…
Add table
Reference in a new issue