mirror of
https://github.com/saltstack/salt-bootstrap.git
synced 2025-04-17 10:10:25 +00:00
Adding 3006.0rc1 to Github actions.
This commit is contained in:
parent
d40c7f12e7
commit
8ece9b9cba
3 changed files with 59 additions and 15 deletions
28
.github/workflows/ci.yml
vendored
28
.github/workflows/ci.yml
vendored
|
@ -249,7 +249,7 @@ jobs:
|
|||
distro-slug: almalinux-8
|
||||
display-name: AlmaLinux 8
|
||||
timeout: 20
|
||||
instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly"]'
|
||||
instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly", "onedir_rc-3006.0rc1"]'
|
||||
|
||||
|
||||
almalinux-9:
|
||||
|
@ -263,7 +263,7 @@ jobs:
|
|||
distro-slug: almalinux-9
|
||||
display-name: AlmaLinux 9
|
||||
timeout: 20
|
||||
instances: '["git-3005", "onedir-3005", "git-master", "onedir-nightly"]'
|
||||
instances: '["git-3005", "onedir-3005", "git-master", "onedir-nightly", "onedir_rc-3006.0rc1"]'
|
||||
|
||||
|
||||
amazon-2:
|
||||
|
@ -277,7 +277,7 @@ jobs:
|
|||
distro-slug: amazon-2
|
||||
display-name: Amazon 2
|
||||
timeout: 20
|
||||
instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "git-master", "latest", "onedir-nightly"]'
|
||||
instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "git-master", "latest", "onedir-nightly", "onedir_rc-3006.0rc1"]'
|
||||
|
||||
|
||||
arch:
|
||||
|
@ -305,7 +305,7 @@ jobs:
|
|||
distro-slug: centos-7
|
||||
display-name: CentOS 7
|
||||
timeout: 20
|
||||
instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly"]'
|
||||
instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly", "onedir_rc-3006.0rc1"]'
|
||||
|
||||
|
||||
centos-stream8:
|
||||
|
@ -319,7 +319,7 @@ jobs:
|
|||
distro-slug: centos-stream8
|
||||
display-name: CentOS Stream 8
|
||||
timeout: 20
|
||||
instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly"]'
|
||||
instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly", "onedir_rc-3006.0rc1"]'
|
||||
|
||||
|
||||
centos-stream9:
|
||||
|
@ -333,7 +333,7 @@ jobs:
|
|||
distro-slug: centos-stream9
|
||||
display-name: CentOS Stream 9
|
||||
timeout: 20
|
||||
instances: '["git-3005", "onedir-3005", "git-master", "onedir-nightly"]'
|
||||
instances: '["git-3005", "onedir-3005", "git-master", "onedir-nightly", "onedir_rc-3006.0rc1"]'
|
||||
|
||||
|
||||
debian-10:
|
||||
|
@ -347,7 +347,7 @@ jobs:
|
|||
distro-slug: debian-10
|
||||
display-name: Debian 10
|
||||
timeout: 20
|
||||
instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "git-master", "latest", "onedir-nightly"]'
|
||||
instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "git-master", "latest", "onedir-nightly", "onedir_rc-3006.0rc1"]'
|
||||
|
||||
|
||||
debian-11:
|
||||
|
@ -361,7 +361,7 @@ jobs:
|
|||
distro-slug: debian-11
|
||||
display-name: Debian 11
|
||||
timeout: 20
|
||||
instances: '["stable-3004", "stable-3005", "onedir-3005", "git-master", "latest", "onedir-nightly"]'
|
||||
instances: '["stable-3004", "stable-3005", "onedir-3005", "git-master", "latest", "onedir-nightly", "onedir_rc-3006.0rc1"]'
|
||||
|
||||
|
||||
fedora-35:
|
||||
|
@ -487,7 +487,7 @@ jobs:
|
|||
distro-slug: oraclelinux-7
|
||||
display-name: Oracle Linux 7
|
||||
timeout: 20
|
||||
instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly"]'
|
||||
instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly", "onedir_rc-3006.0rc1"]'
|
||||
|
||||
|
||||
oraclelinux-8:
|
||||
|
@ -501,7 +501,7 @@ jobs:
|
|||
distro-slug: oraclelinux-8
|
||||
display-name: Oracle Linux 8
|
||||
timeout: 20
|
||||
instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly"]'
|
||||
instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly", "onedir_rc-3006.0rc1"]'
|
||||
|
||||
|
||||
rockylinux-8:
|
||||
|
@ -515,7 +515,7 @@ jobs:
|
|||
distro-slug: rockylinux-8
|
||||
display-name: Rocky Linux 8
|
||||
timeout: 20
|
||||
instances: '["stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly"]'
|
||||
instances: '["stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly", "onedir_rc-3006.0rc1"]'
|
||||
|
||||
|
||||
rockylinux-9:
|
||||
|
@ -529,7 +529,7 @@ jobs:
|
|||
distro-slug: rockylinux-9
|
||||
display-name: Rocky Linux 9
|
||||
timeout: 20
|
||||
instances: '["git-3005", "onedir-3005", "git-master", "onedir-nightly"]'
|
||||
instances: '["git-3005", "onedir-3005", "git-master", "onedir-nightly", "onedir_rc-3006.0rc1"]'
|
||||
|
||||
|
||||
ubuntu-2004:
|
||||
|
@ -543,7 +543,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", "onedir-nightly"]'
|
||||
instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "git-master", "latest", "onedir-nightly", "onedir_rc-3006.0rc1"]'
|
||||
|
||||
|
||||
ubuntu-2204:
|
||||
|
@ -557,7 +557,7 @@ jobs:
|
|||
distro-slug: ubuntu-2204
|
||||
display-name: Ubuntu 22.04
|
||||
timeout: 20
|
||||
instances: '["stable-3004", "stable-3005", "onedir-3005", "git-master", "latest", "onedir-nightly"]'
|
||||
instances: '["stable-3004", "stable-3005", "onedir-3005", "git-master", "latest", "onedir-nightly", "onedir_rc-3006.0rc1"]'
|
||||
|
||||
|
||||
set-pipeline-exit-status:
|
||||
|
|
32
.github/workflows/templates/generate.py
vendored
32
.github/workflows/templates/generate.py
vendored
|
@ -88,6 +88,23 @@ ONEDIR_DISTROS = [
|
|||
"ubuntu-2204",
|
||||
]
|
||||
|
||||
ONEDIR_RC_DISTROS = [
|
||||
"almalinux-8",
|
||||
"almalinux-9",
|
||||
"amazon-2",
|
||||
"centos-7",
|
||||
"centos-stream8",
|
||||
"centos-stream9",
|
||||
"debian-10",
|
||||
"debian-11",
|
||||
"oraclelinux-7",
|
||||
"oraclelinux-8",
|
||||
"rockylinux-8",
|
||||
"rockylinux-9",
|
||||
"ubuntu-2004",
|
||||
"ubuntu-2204",
|
||||
]
|
||||
|
||||
BLACKLIST_3003 = [
|
||||
"almalinux-9",
|
||||
"arch",
|
||||
|
@ -201,6 +218,7 @@ SALT_VERSIONS = [
|
|||
"master",
|
||||
"latest",
|
||||
"nightly",
|
||||
"3006.0rc1",
|
||||
]
|
||||
|
||||
ONEDIR_SALT_VERSIONS = [
|
||||
|
@ -209,6 +227,10 @@ ONEDIR_SALT_VERSIONS = [
|
|||
"nightly",
|
||||
]
|
||||
|
||||
ONEDIR_RC_SALT_VERSIONS = [
|
||||
"3006.0rc1",
|
||||
]
|
||||
|
||||
VERSION_DISPLAY_NAMES = {
|
||||
"3003": "v3003",
|
||||
"3004": "v3004",
|
||||
|
@ -221,10 +243,12 @@ VERSION_DISPLAY_NAMES = {
|
|||
STABLE_VERSION_BLACKLIST = [
|
||||
"master",
|
||||
"nightly",
|
||||
"3006.0rc1",
|
||||
]
|
||||
|
||||
GIT_VERSION_BLACKLIST = [
|
||||
"nightly",
|
||||
"3006.0rc1",
|
||||
]
|
||||
|
||||
# TODO: Revert the commit relating to this section, once the Git-based builds
|
||||
|
@ -494,13 +518,19 @@ def generate_test_jobs():
|
|||
instances.append(salt_version)
|
||||
continue
|
||||
|
||||
for bootstrap_type in ("stable", "git", "onedir"):
|
||||
for bootstrap_type in ("stable", "git", "onedir", "onedir_rc"):
|
||||
if bootstrap_type == "onedir":
|
||||
if salt_version not in ONEDIR_SALT_VERSIONS:
|
||||
continue
|
||||
if distro not in ONEDIR_DISTROS:
|
||||
continue
|
||||
|
||||
if bootstrap_type == "onedir_rc":
|
||||
if salt_version not in ONEDIR_RC_SALT_VERSIONS:
|
||||
continue
|
||||
if distro not in ONEDIR_RC_DISTROS:
|
||||
continue
|
||||
|
||||
if bootstrap_type == "stable":
|
||||
if salt_version in STABLE_VERSION_BLACKLIST:
|
||||
continue
|
||||
|
|
14
kitchen.yml
14
kitchen.yml
|
@ -265,6 +265,20 @@ suites:
|
|||
salt_version: 3005
|
||||
salt_bootstrap_options: -MP onedir %s
|
||||
|
||||
- name: onedir-rc-3006.0rc1
|
||||
provisioner:
|
||||
salt_version: 3006.0rc1
|
||||
salt_bootstrap_options: -R staging.repo.saltproject.io -MP onedir_rc %s
|
||||
excludes:
|
||||
- arch
|
||||
- freebsd-131
|
||||
- freebsd-123
|
||||
- gentoo
|
||||
- openbsd-6
|
||||
- opensuse-15
|
||||
- opensuse-tumbleweed
|
||||
- ubuntu-1804
|
||||
|
||||
verifier:
|
||||
name: shell
|
||||
remote_exec: false
|
||||
|
|
Loading…
Add table
Reference in a new issue