saltstack/salt-bootstrap
1
0
Fork 0
mirror of https://github.com/saltstack/salt-bootstrap.git synced 2025-04-17 10:10:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adding 3005 and onedir to various bits

Browse source
This commit is contained in:
Gareth J. Greenaway 2022-11-03 11:32:55 -07:00 • committed by Pedro Algarvio
parent 4686d55c5a
commit 081b81d2e3
3 changed files with 59 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
.github/workflows/ci.yml vendored
View file

@ -173,7 +173,7 @@ jobs:
display-name: macOS 10.15
timeout: 20
runs-on: macos-10.15
instances: '["stable-3003", "stable-3004", "latest"]'
instances: '["stable-3003", "stable-3004", "stable-3005", "latest"]'
macos-11:
@ -188,7 +188,7 @@ jobs:
display-name: macOS 11
timeout: 20
runs-on: macos-11
instances: '["stable-3003", "stable-3004", "latest"]'
instances: '["stable-3003", "stable-3004", "stable-3005", "latest"]'
macos-12:
@ -203,7 +203,7 @@ jobs:
display-name: macOS 12
timeout: 20
runs-on: macos-12
instances: '["stable-3003", "stable-3004", "latest"]'
instances: '["stable-3003", "stable-3004", "stable-3005", "latest"]'
@ -219,7 +219,7 @@ jobs:
display-name: Windows 2019
timeout: 20
runs-on: windows-2019
instances: '["stable-3003", "stable-3004", "latest"]'
instances: '["stable-3003", "stable-3004", "stable-3005", "latest"]'
windows-2022:
@ -234,7 +234,7 @@ jobs:
display-name: Windows 2022
timeout: 20
runs-on: windows-2022
instances: '["stable-3003", "stable-3004", "latest"]'
instances: '["stable-3003", "stable-3004", "stable-3005", "latest"]'
@ -249,7 +249,7 @@ jobs:
distro-slug: almalinux-8
display-name: AlmaLinux 8
timeout: 20
instances: '["stable-3003", "git-3003", "stable-3004", "git-3004", "git-master", "latest"]'
instances: '["stable-3003", "git-3003", "onedir-3003", "stable-3004", "git-3004", "onedir-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "onedir-master", "latest"]'
amazon-2:
@ -263,7 +263,7 @@ jobs:
distro-slug: amazon-2
display-name: Amazon 2
timeout: 20
instances: '["stable-3003", "stable-3004", "git-master", "latest"]'
instances: '["stable-3003", "onedir-3003", "stable-3004", "onedir-3004", "stable-3005", "onedir-3005", "git-master", "onedir-master", "latest"]'
arch:
@ -277,7 +277,7 @@ jobs:
distro-slug: arch
display-name: Arch
timeout: 20
instances: '["git-master", "latest"]'
instances: '["git-master", "onedir-master", "latest"]'
centos-7:
@ -291,7 +291,7 @@ jobs:
distro-slug: centos-7
display-name: CentOS 7
timeout: 20
instances: '["stable-3003", "git-3003", "stable-3004", "git-3004", "git-master", "latest"]'
instances: '["stable-3003", "git-3003", "onedir-3003", "stable-3004", "git-3004", "onedir-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "onedir-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", "stable-3004", "git-3004", "git-master", "latest"]'
instances: '["stable-3003", "git-3003", "onedir-3003", "stable-3004", "git-3004", "onedir-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "onedir-master", "latest"]'
debian-10:
@ -319,7 +319,7 @@ jobs:
distro-slug: debian-10
display-name: Debian 10
timeout: 20
instances: '["stable-3003", "stable-3004", "git-master", "latest"]'
instances: '["stable-3003", "onedir-3003", "stable-3004", "onedir-3004", "stable-3005", "onedir-3005", "git-master", "onedir-master", "latest"]'
debian-11:
@ -333,7 +333,7 @@ jobs:
distro-slug: debian-11
display-name: Debian 11
timeout: 20
instances: '["stable-3004", "git-master", "latest"]'
instances: '["stable-3004", "onedir-3004", "stable-3005", "onedir-3005", "git-master", "onedir-master", "latest"]'
debian-9:
@ -347,7 +347,7 @@ jobs:
distro-slug: debian-9
display-name: Debian 9
timeout: 20
instances: '["stable-3003", "git-3003", "stable-3004", "git-3004", "git-master", "latest"]'
instances: '["stable-3003", "git-3003", "onedir-3003", "stable-3004", "git-3004", "onedir-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "onedir-master", "latest"]'
fedora-35:
@ -361,7 +361,7 @@ jobs:
distro-slug: fedora-35
display-name: Fedora 35
timeout: 20
instances: '["git-master", "latest"]'
instances: '["git-master", "onedir-master", "latest"]'
fedora-36:
@ -375,7 +375,7 @@ jobs:
distro-slug: fedora-36
display-name: Fedora 36
timeout: 20
instances: '["git-master", "latest"]'
instances: '["git-master", "onedir-master", "latest"]'
gentoo:
@ -389,7 +389,7 @@ jobs:
distro-slug: gentoo
display-name: Gentoo
timeout: 90
instances: '["git-master", "latest"]'
instances: '["git-master", "onedir-master", "latest"]'
gentoo-systemd:
@ -403,7 +403,7 @@ jobs:
distro-slug: gentoo-systemd
display-name: Gentoo (systemd)
timeout: 90
instances: '["git-master", "latest"]'
instances: '["git-master", "onedir-master", "latest"]'
opensuse-15:
@ -417,7 +417,7 @@ jobs:
distro-slug: opensuse-15
display-name: Opensuse 15
timeout: 20
instances: '["git-master", "latest"]'
instances: '["git-master", "onedir-master", "latest"]'
opensuse-tumbleweed:
@ -431,7 +431,7 @@ jobs:
distro-slug: opensuse-tumbleweed
display-name: Opensuse Tumbleweed
timeout: 20
instances: '["git-master", "latest"]'
instances: '["git-master", "onedir-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", "stable-3004", "git-3004", "git-master", "latest"]'
instances: '["stable-3003", "git-3003", "onedir-3003", "stable-3004", "git-3004", "onedir-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "onedir-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", "stable-3004", "git-3004", "git-master", "latest"]'
instances: '["stable-3003", "git-3003", "onedir-3003", "stable-3004", "git-3004", "onedir-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "onedir-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", "git-master", "latest"]'
instances: '["stable-3004", "git-3004", "onedir-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "onedir-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", "stable-3004", "git-3004", "git-master", "latest"]'
instances: '["stable-3003", "git-3003", "onedir-3003", "stable-3004", "git-3004", "onedir-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "onedir-master", "latest"]'
ubuntu-2004:
@ -501,7 +501,7 @@ jobs:
distro-slug: ubuntu-2004
display-name: Ubuntu 20.04
timeout: 20
instances: '["stable-3003", "stable-3004", "git-master", "latest"]'
instances: '["stable-3003", "onedir-3003", "stable-3004", "onedir-3004", "stable-3005", "onedir-3005", "git-master", "onedir-master", "latest"]'
ubuntu-2204:
@ -515,7 +515,7 @@ jobs:
distro-slug: ubuntu-2204
display-name: Ubuntu 22.04
timeout: 20
instances: '["stable-3004", "git-master", "latest"]'
instances: '["stable-3004", "onedir-3004", "stable-3005", "onedir-3005", "git-master", "onedir-master", "latest"]'
set-pipeline-exit-status:

34
.github/workflows/templates/generate.py vendored
View file

@ -108,6 +108,16 @@ BLACKLIST_3004 = [
"opensuse-tumbleweed",
]
BLACKLIST_3005 = [
"arch",
"fedora-35",
"fedora-36",
"gentoo",
"gentoo-systemd",
"opensuse-15",
"opensuse-tumbleweed",
]
BLACKLIST_GIT_3004 = [
"amazon-2",
"arch",
@ -124,9 +134,26 @@ BLACKLIST_GIT_3004 = [
"ubuntu-2204",
]
BLACKLIST_GIT_3005 = [
"amazon-2",
"arch",
"debian-10",
"debian-11",
"fedora-35",
"fedora-36",
"gentoo",
"gentoo-systemd",
"opensuse-15",
"opensuse-tumbleweed",
"ubuntu-2004",
"ubuntu-2110",
"ubuntu-2204",
]
SALT_VERSIONS = [
"3003",
"3004",
"3005",
"master",
"latest",
]
@ -134,6 +161,7 @@ SALT_VERSIONS = [
VERSION_DISPLAY_NAMES = {
"3003": "v3003",
"3004": "v3004",
"3005": "v3005",
"master": "Master",
"latest": "Latest",
}
@ -381,7 +409,7 @@ def generate_test_jobs():
instances.append(salt_version)
continue
for bootstrap_type in ("stable", "git"):
for bootstrap_type in ("stable", "git", "onedir"):
if bootstrap_type == "stable":
if salt_version == "master":
# For the master branch there's no stable build
@ -399,11 +427,13 @@ def generate_test_jobs():
BLACKLIST = {
"3003": BLACKLIST_3003,
"3004": BLACKLIST_3004,
"3005": BLACKLIST_3005,
}
if bootstrap_type == "git":
BLACKLIST = {
"3003": BLACKLIST_GIT_3003,
"3004": BLACKLIST_GIT_3004,
"3005": BLACKLIST_GIT_3005,
}
# .0 versions are a virtual version for pinning to the first
@ -413,7 +443,7 @@ def generate_test_jobs():
continue
if (
salt_version in ("3003", "3004")
salt_version in ("3003", "3004", "3005")
and distro in BLACKLIST[salt_version]
):
continue

10
kitchen.yml
View file

@ -196,22 +196,16 @@ suites:
salt_version: latest
salt_bootstrap_options: -MP stable %s
- name: onedir latest
- name: onedir-latest
provisioner:
salt_version: latest
salt_bootstrap_options: -MP onedir %s
- name: onedir_3005
- name: onedir-3005
provisioner:
salt_version: 3005
salt_bootstrap_options: -MP onedir %s
- name: onedir_3005.1
provisioner:
salt_version: 3005.1
salt_bootstrap_options: -MP onedir %s
verifier:
name: shell
remote_exec: false