mirror of
https://github.com/saltstack/salt-bootstrap.git
synced 2025-04-17 10:10:25 +00:00
Only add onedir for supported versions.
This commit is contained in:
Gareth J. Greenaway
Pedro Algarvio
parent
081b81d2e3
commit
6a613d0dea
2 changed files with 29 additions and 20 deletions
40
.github/workflows/ci.yml
vendored
40
.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", "onedir-3003", "stable-3004", "git-3004", "onedir-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "onedir-master", "latest"]'
|
||||
instances: '["stable-3003", "git-3003", "stable-3004", "git-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "latest"]'
|
||||
|
||||
|
||||
amazon-2:
|
||||
|
|
@ -263,7 +263,7 @@ jobs:
|
|||
distro-slug: amazon-2
|
||||
display-name: Amazon 2
|
||||
timeout: 20
|
||||
instances: '["stable-3003", "onedir-3003", "stable-3004", "onedir-3004", "stable-3005", "onedir-3005", "git-master", "onedir-master", "latest"]'
|
||||
instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "git-master", "latest"]'
|
||||
|
||||
|
||||
arch:
|
||||
|
|
@ -277,7 +277,7 @@ jobs:
|
|||
distro-slug: arch
|
||||
display-name: Arch
|
||||
timeout: 20
|
||||
instances: '["git-master", "onedir-master", "latest"]'
|
||||
instances: '["git-master", "latest"]'
|
||||
|
||||
|
||||
centos-7:
|
||||
|
|
@ -291,7 +291,7 @@ jobs:
|
|||
distro-slug: centos-7
|
||||
display-name: CentOS 7
|
||||
timeout: 20
|
||||
instances: '["stable-3003", "git-3003", "onedir-3003", "stable-3004", "git-3004", "onedir-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "onedir-master", "latest"]'
|
||||
instances: '["stable-3003", "git-3003", "stable-3004", "git-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "latest"]'
|
||||
|
||||
|
||||
centos-stream8:
|
||||
|
|
@ -305,7 +305,7 @@ jobs:
|
|||
distro-slug: centos-stream8
|
||||
display-name: CentOS Stream 8
|
||||
timeout: 20
|
||||
instances: '["stable-3003", "git-3003", "onedir-3003", "stable-3004", "git-3004", "onedir-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "onedir-master", "latest"]'
|
||||
instances: '["stable-3003", "git-3003", "stable-3004", "git-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "latest"]'
|
||||
|
||||
|
||||
debian-10:
|
||||
|
|
@ -319,7 +319,7 @@ jobs:
|
|||
distro-slug: debian-10
|
||||
display-name: Debian 10
|
||||
timeout: 20
|
||||
instances: '["stable-3003", "onedir-3003", "stable-3004", "onedir-3004", "stable-3005", "onedir-3005", "git-master", "onedir-master", "latest"]'
|
||||
instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "git-master", "latest"]'
|
||||
|
||||
|
||||
debian-11:
|
||||
|
|
@ -333,7 +333,7 @@ jobs:
|
|||
distro-slug: debian-11
|
||||
display-name: Debian 11
|
||||
timeout: 20
|
||||
instances: '["stable-3004", "onedir-3004", "stable-3005", "onedir-3005", "git-master", "onedir-master", "latest"]'
|
||||
instances: '["stable-3004", "stable-3005", "onedir-3005", "git-master", "latest"]'
|
||||
|
||||
|
||||
debian-9:
|
||||
|
|
@ -347,7 +347,7 @@ jobs:
|
|||
distro-slug: debian-9
|
||||
display-name: Debian 9
|
||||
timeout: 20
|
||||
instances: '["stable-3003", "git-3003", "onedir-3003", "stable-3004", "git-3004", "onedir-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "onedir-master", "latest"]'
|
||||
instances: '["stable-3003", "git-3003", "stable-3004", "git-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "latest"]'
|
||||
|
||||
|
||||
fedora-35:
|
||||
|
|
@ -361,7 +361,7 @@ jobs:
|
|||
distro-slug: fedora-35
|
||||
display-name: Fedora 35
|
||||
timeout: 20
|
||||
instances: '["git-master", "onedir-master", "latest"]'
|
||||
instances: '["git-master", "latest"]'
|
||||
|
||||
|
||||
fedora-36:
|
||||
|
|
@ -375,7 +375,7 @@ jobs:
|
|||
distro-slug: fedora-36
|
||||
display-name: Fedora 36
|
||||
timeout: 20
|
||||
instances: '["git-master", "onedir-master", "latest"]'
|
||||
instances: '["git-master", "latest"]'
|
||||
|
||||
|
||||
gentoo:
|
||||
|
|
@ -389,7 +389,7 @@ jobs:
|
|||
distro-slug: gentoo
|
||||
display-name: Gentoo
|
||||
timeout: 90
|
||||
instances: '["git-master", "onedir-master", "latest"]'
|
||||
instances: '["git-master", "latest"]'
|
||||
|
||||
|
||||
gentoo-systemd:
|
||||
|
|
@ -403,7 +403,7 @@ jobs:
|
|||
distro-slug: gentoo-systemd
|
||||
display-name: Gentoo (systemd)
|
||||
timeout: 90
|
||||
instances: '["git-master", "onedir-master", "latest"]'
|
||||
instances: '["git-master", "latest"]'
|
||||
|
||||
|
||||
opensuse-15:
|
||||
|
|
@ -417,7 +417,7 @@ jobs:
|
|||
distro-slug: opensuse-15
|
||||
display-name: Opensuse 15
|
||||
timeout: 20
|
||||
instances: '["git-master", "onedir-master", "latest"]'
|
||||
instances: '["git-master", "latest"]'
|
||||
|
||||
|
||||
opensuse-tumbleweed:
|
||||
|
|
@ -431,7 +431,7 @@ jobs:
|
|||
distro-slug: opensuse-tumbleweed
|
||||
display-name: Opensuse Tumbleweed
|
||||
timeout: 20
|
||||
instances: '["git-master", "onedir-master", "latest"]'
|
||||
instances: '["git-master", "latest"]'
|
||||
|
||||
|
||||
oraclelinux-7:
|
||||
|
|
@ -445,7 +445,7 @@ jobs:
|
|||
distro-slug: oraclelinux-7
|
||||
display-name: Oracle Linux 7
|
||||
timeout: 20
|
||||
instances: '["stable-3003", "git-3003", "onedir-3003", "stable-3004", "git-3004", "onedir-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "onedir-master", "latest"]'
|
||||
instances: '["stable-3003", "git-3003", "stable-3004", "git-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "latest"]'
|
||||
|
||||
|
||||
oraclelinux-8:
|
||||
|
|
@ -459,7 +459,7 @@ jobs:
|
|||
distro-slug: oraclelinux-8
|
||||
display-name: Oracle Linux 8
|
||||
timeout: 20
|
||||
instances: '["stable-3003", "git-3003", "onedir-3003", "stable-3004", "git-3004", "onedir-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "onedir-master", "latest"]'
|
||||
instances: '["stable-3003", "git-3003", "stable-3004", "git-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "latest"]'
|
||||
|
||||
|
||||
rockylinux-8:
|
||||
|
|
@ -473,7 +473,7 @@ jobs:
|
|||
distro-slug: rockylinux-8
|
||||
display-name: Rocky Linux 8
|
||||
timeout: 20
|
||||
instances: '["stable-3004", "git-3004", "onedir-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "onedir-master", "latest"]'
|
||||
instances: '["stable-3004", "git-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "latest"]'
|
||||
|
||||
|
||||
ubuntu-1804:
|
||||
|
|
@ -487,7 +487,7 @@ jobs:
|
|||
distro-slug: ubuntu-1804
|
||||
display-name: Ubuntu 18.04
|
||||
timeout: 20
|
||||
instances: '["stable-3003", "git-3003", "onedir-3003", "stable-3004", "git-3004", "onedir-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "onedir-master", "latest"]'
|
||||
instances: '["stable-3003", "git-3003", "stable-3004", "git-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "latest"]'
|
||||
|
||||
|
||||
ubuntu-2004:
|
||||
|
|
@ -501,7 +501,7 @@ jobs:
|
|||
distro-slug: ubuntu-2004
|
||||
display-name: Ubuntu 20.04
|
||||
timeout: 20
|
||||
instances: '["stable-3003", "onedir-3003", "stable-3004", "onedir-3004", "stable-3005", "onedir-3005", "git-master", "onedir-master", "latest"]'
|
||||
instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "git-master", "latest"]'
|
||||
|
||||
|
||||
ubuntu-2204:
|
||||
|
|
@ -515,7 +515,7 @@ jobs:
|
|||
distro-slug: ubuntu-2204
|
||||
display-name: Ubuntu 22.04
|
||||
timeout: 20
|
||||
instances: '["stable-3004", "onedir-3004", "stable-3005", "onedir-3005", "git-master", "onedir-master", "latest"]'
|
||||
instances: '["stable-3004", "stable-3005", "onedir-3005", "git-master", "latest"]'
|
||||
|
||||
|
||||
set-pipeline-exit-status:
|
||||
|
|
|
|||
9
.github/workflows/templates/generate.py
vendored
9
.github/workflows/templates/generate.py
vendored
|
|
@ -158,6 +158,11 @@ SALT_VERSIONS = [
|
|||
"latest",
|
||||
]
|
||||
|
||||
ONEDIR_SALT_VERSIONS = [
|
||||
"3005",
|
||||
"latest",
|
||||
]
|
||||
|
||||
VERSION_DISPLAY_NAMES = {
|
||||
"3003": "v3003",
|
||||
"3004": "v3004",
|
||||
|
|
@ -410,6 +415,10 @@ def generate_test_jobs():
|
|||
continue
|
||||
|
||||
for bootstrap_type in ("stable", "git", "onedir"):
|
||||
if bootstrap_type == "onedir":
|
||||
if salt_version not in ONEDIR_SALT_VERSIONS:
|
||||
continue
|
||||
|
||||
if bootstrap_type == "stable":
|
||||
if salt_version == "master":
|
||||
# For the master branch there's no stable build
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue