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

Added macos-12, removed Photon-3, and added further cleanup of old OSs and Salt versions

Browse source
This commit is contained in:
David Murphy 2024-02-08 09:28:56 -07:00 • committed by Daniel Wozniak
parent 78ecaec870
commit 10d602791d
6 changed files with 319 additions and 2078 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -161,21 +161,6 @@ jobs:
macos-11:
name: macOS 11
if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
uses: ./.github/workflows/test-macos.yml
needs:
- lint
- generate-actions-workflow
with:
distro-slug: macos-11
display-name: macOS 11
timeout: 20
runs-on: macos-11
instances: '["old-stable-3003", "old-stable-3004", "old-stable-3005", "stable-3006", "stable-3006-1", "latest"]'
macos-12:
name: macOS 12
if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
@ -188,7 +173,22 @@ jobs:
display-name: macOS 12
timeout: 20
runs-on: macos-12
instances: '["old-stable-3003", "old-stable-3004", "old-stable-3005", "stable-3006", "stable-3006-1", "latest"]'
instances: '["stable-3006", "stable-3006-6", "latest"]'
macos-13:
name: macOS 13
if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
uses: ./.github/workflows/test-macos.yml
needs:
- lint
- generate-actions-workflow
with:
distro-slug: macos-13
display-name: macOS 13
timeout: 20
runs-on: macos-13
instances: '["stable-3006", "stable-3006-6", "latest"]'
@ -204,7 +204,7 @@ jobs:
display-name: Windows 2019
timeout: 20
runs-on: windows-2019
instances: '["stable-3005", "stable-3005-5", "stable-3006", "stable-3006-1", "latest"]'
instances: '["stable-3006", "stable-3006-6", "latest"]'
windows-2022:
@ -219,7 +219,7 @@ jobs:
display-name: Windows 2022
timeout: 20
runs-on: windows-2022
instances: '["stable-3005", "stable-3005-5", "stable-3006", "stable-3006-1", "latest"]'
instances: '["stable-3006", "stable-3006-6", "latest"]'
@ -234,7 +234,7 @@ jobs:
distro-slug: almalinux-8
display-name: AlmaLinux 8
timeout: 20
instances: '["old-stable-3003", "old-stable-3004", "old-stable-3005", "stable-3005", "onedir-3005", "stable-3005-5", "stable-3006", "onedir-3006", "stable-3006-1", "latest", "default"]'
instances: '["stable-3006", "onedir-3006", "stable-3006-6", "latest", "default"]'
almalinux-9:
@ -248,7 +248,7 @@ jobs:
distro-slug: almalinux-9
display-name: AlmaLinux 9
timeout: 20
instances: '["git-3005", "stable-3006", "onedir-3006", "stable-3006-1", "git-master", "latest", "default"]'
instances: '["stable-3006", "onedir-3006", "stable-3006-6", "git-master", "latest", "default"]'
amazon-2:
@ -262,7 +262,7 @@ jobs:
distro-slug: amazon-2
display-name: Amazon 2
timeout: 20
instances: '["old-stable-3003", "old-stable-3004", "old-stable-3005", "stable-3005", "onedir-3005", "stable-3005-5", "stable-3006", "onedir-3006", "stable-3006-1", "latest", "default"]'
instances: '["stable-3006", "onedir-3006", "stable-3006-6", "latest", "default"]'
amazon-2023:
@ -276,7 +276,7 @@ jobs:
distro-slug: amazon-2023
display-name: Amazon 2023
timeout: 20
instances: '["stable-3005", "onedir-3005", "stable-3005-5", "stable-3006", "git-3006", "onedir-3006", "stable-3006-1", "git-master", "latest", "default"]'
instances: '["stable-3006", "git-3006", "onedir-3006", "stable-3006-6", "git-master", "latest", "default"]'
arch:
@ -304,7 +304,7 @@ jobs:
distro-slug: centos-7
display-name: CentOS 7
timeout: 20
instances: '["old-stable-3003", "old-stable-3004", "old-stable-3005", "stable-3005", "onedir-3005", "stable-3005-5", "stable-3006", "onedir-3006", "stable-3006-1", "latest", "default"]'
instances: '["stable-3006", "onedir-3006", "stable-3006-6", "latest", "default"]'
centos-stream8:
@ -318,7 +318,7 @@ jobs:
distro-slug: centos-stream8
display-name: CentOS Stream 8
timeout: 20
instances: '["old-stable-3003", "old-stable-3004", "old-stable-3005", "stable-3005", "onedir-3005", "stable-3005-5", "stable-3006", "onedir-3006", "stable-3006-1", "latest", "default"]'
instances: '["stable-3006", "onedir-3006", "stable-3006-6", "latest", "default"]'
centos-stream9:
@ -332,7 +332,7 @@ jobs:
distro-slug: centos-stream9
display-name: CentOS Stream 9
timeout: 20
instances: '["git-3005", "stable-3006", "onedir-3006", "stable-3006-1", "git-master", "latest", "default"]'
instances: '["stable-3006", "onedir-3006", "stable-3006-6", "git-master", "latest", "default"]'
debian-10:
@ -346,7 +346,7 @@ jobs:
distro-slug: debian-10
display-name: Debian 10
timeout: 20
instances: '["old-stable-3003", "old-stable-3004", "old-stable-3005", "stable-3005", "onedir-3005", "stable-3005-5", "stable-3006", "onedir-3006", "stable-3006-1", "latest", "default"]'
instances: '["stable-3006", "onedir-3006", "stable-3006-6", "latest", "default"]'
debian-11:
@ -360,7 +360,7 @@ jobs:
distro-slug: debian-11
display-name: Debian 11
timeout: 20
instances: '["old-stable-3004", "old-stable-3005", "stable-3005", "onedir-3005", "stable-3005-5", "stable-3006", "onedir-3006", "stable-3006-1", "git-master", "latest", "default"]'
instances: '["stable-3006", "onedir-3006", "stable-3006-6", "git-master", "latest", "default"]'
debian-12:
@ -374,21 +374,7 @@ jobs:
distro-slug: debian-12
display-name: Debian 12
timeout: 20
instances: '["stable-3006", "onedir-3006", "stable-3006-1", "git-master", "latest", "default"]'
fedora-37:
name: Fedora 37
if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
uses: ./.github/workflows/test-linux.yml
needs:
- lint
- generate-actions-workflow
with:
distro-slug: fedora-37
display-name: Fedora 37
timeout: 20
instances: '["stable-3006", "onedir-3006", "stable-3006-1", "latest", "default"]'
instances: '["stable-3006", "onedir-3006", "stable-3006-6", "git-master", "latest", "default"]'
fedora-38:
@ -402,7 +388,7 @@ jobs:
distro-slug: fedora-38
display-name: Fedora 38
timeout: 20
instances: '["stable-3006", "onedir-3006", "stable-3006-1", "latest", "default"]'
instances: '["stable-3006", "onedir-3006", "stable-3006-6", "latest", "default"]'
fedora-39:
@ -416,7 +402,7 @@ jobs:
distro-slug: fedora-39
display-name: Fedora 39
timeout: 20
instances: '["stable-3006", "onedir-3006", "stable-3006-1", "latest", "default"]'
instances: '["stable-3006", "onedir-3006", "stable-3006-6", "latest", "default"]'
gentoo:
@ -486,7 +472,7 @@ jobs:
distro-slug: oraclelinux-7
display-name: Oracle Linux 7
timeout: 20
instances: '["old-stable-3003", "old-stable-3004", "old-stable-3005", "stable-3005", "onedir-3005", "stable-3005-5", "stable-3006", "onedir-3006", "stable-3006-1", "latest", "default"]'
instances: '["stable-3006", "onedir-3006", "stable-3006-6", "latest", "default"]'
oraclelinux-8:
@ -500,21 +486,7 @@ jobs:
distro-slug: oraclelinux-8
display-name: Oracle Linux 8
timeout: 20
instances: '["old-stable-3003", "old-stable-3004", "old-stable-3005", "stable-3005", "onedir-3005", "stable-3005-5", "stable-3006", "onedir-3006", "stable-3006-1", "latest", "default"]'
photon-3:
name: Photon OS 3
if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
uses: ./.github/workflows/test-linux.yml
needs:
- lint
- generate-actions-workflow
with:
distro-slug: photon-3
display-name: Photon OS 3
timeout: 20
instances: '["stable-3006", "onedir-3006", "stable-3006-1", "latest", "default"]'
instances: '["stable-3006", "onedir-3006", "stable-3006-6", "latest", "default"]'
photon-4:
@ -528,7 +500,21 @@ jobs:
distro-slug: photon-4
display-name: Photon OS 4
timeout: 20
instances: '["stable-3006", "onedir-3006", "stable-3006-1", "git-master", "latest", "default"]'
instances: '["stable-3006", "onedir-3006", "stable-3006-6", "git-master", "latest", "default"]'
photon-5:
name: Photon OS 5
if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
uses: ./.github/workflows/test-linux.yml
needs:
- lint
- generate-actions-workflow
with:
distro-slug: photon-5
display-name: Photon OS 5
timeout: 20
instances: '["stable-3006", "onedir-3006", "stable-3006-6", "git-master", "latest", "default"]'
rockylinux-8:
@ -542,7 +528,7 @@ jobs:
distro-slug: rockylinux-8
display-name: Rocky Linux 8
timeout: 20
instances: '["old-stable-3004", "old-stable-3005", "stable-3005", "onedir-3005", "stable-3005-5", "stable-3006", "onedir-3006", "stable-3006-1", "latest", "default"]'
instances: '["stable-3006", "onedir-3006", "stable-3006-6", "latest", "default"]'
rockylinux-9:
@ -556,7 +542,7 @@ jobs:
distro-slug: rockylinux-9
display-name: Rocky Linux 9
timeout: 20
instances: '["git-3005", "stable-3006", "onedir-3006", "stable-3006-1", "git-master", "latest", "default"]'
instances: '["stable-3006", "onedir-3006", "stable-3006-6", "git-master", "latest", "default"]'
ubuntu-2004:
@ -570,7 +556,7 @@ jobs:
distro-slug: ubuntu-2004
display-name: Ubuntu 20.04
timeout: 20
instances: '["old-stable-3003", "old-stable-3004", "old-stable-3005", "stable-3005", "onedir-3005", "stable-3005-5", "stable-3006", "onedir-3006", "stable-3006-1", "git-master", "latest", "default"]'
instances: '["stable-3006", "onedir-3006", "stable-3006-6", "git-master", "latest", "default"]'
ubuntu-2204:
@ -584,7 +570,7 @@ jobs:
distro-slug: ubuntu-2204
display-name: Ubuntu 22.04
timeout: 20
instances: '["stable-3005", "onedir-3005", "stable-3005-5", "stable-3006", "onedir-3006", "stable-3006-1", "git-master", "latest", "default"]'
instances: '["stable-3006", "onedir-3006", "stable-3006-6", "git-master", "latest", "default"]'
set-pipeline-exit-status:
@ -598,8 +584,8 @@ jobs:
- freebsd-131
- freebsd-123
- openbsd-7
- macos-11
- macos-12
- macos-13
- windows-2019
- windows-2022
- almalinux-8
@ -613,7 +599,6 @@ jobs:
- debian-10
- debian-11
- debian-12
- fedora-37
- fedora-38
- fedora-39
- gentoo
@ -622,8 +607,8 @@ jobs:
- opensuse-tumbleweed
- oraclelinux-7
- oraclelinux-8
- photon-3
- photon-4
- photon-5
- rockylinux-8
- rockylinux-9
- ubuntu-2004

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

@ -18,8 +18,6 @@ LINUX_DISTROS = [
"debian-10",
"debian-11",
"debian-12",
## DGM "fedora-36",
"fedora-37",
"fedora-38",
"fedora-39",
"gentoo",
@ -28,8 +26,8 @@ LINUX_DISTROS = [
"opensuse-tumbleweed",
"oraclelinux-7",
"oraclelinux-8",
"photon-3",
"photon-4",
"photon-5",
"rockylinux-8",
"rockylinux-9",
"ubuntu-2004",
@ -41,33 +39,16 @@ WINDOWS = [
]
OSX = [
"macos-11",
"macos-12",
"macos-13",
]
BSD = [
"freebsd-131",
"freebsd-123",
"openbsd-7",
]
OLD_STABLE_DISTROS = [
"almalinux-8",
"amazon-2",
"arch",
"centos-7",
"centos-stream8",
"debian-10",
"debian-11",
"gentoo",
"gentoo-systemd",
"opensuse-15",
"opensuse-tumbleweed",
"oraclelinux-7",
"oraclelinux-8",
"rockylinux-8",
"ubuntu-2004",
]
STABLE_DISTROS = [
"almalinux-8",
"almalinux-9",
@ -80,16 +61,14 @@ STABLE_DISTROS = [
"debian-10",
"debian-11",
"debian-12",
## DGM "fedora-36",
"fedora-37",
"fedora-38",
"fedora-39",
"opensuse-15",
"opensuse-tumbleweed",
"oraclelinux-7",
"oraclelinux-8",
"photon-3",
"photon-4",
"photon-5",
"rockylinux-8",
"rockylinux-9",
"ubuntu-2004",
@ -107,14 +86,12 @@ ONEDIR_DISTROS = [
"debian-10",
"debian-11",
"debian-12",
## DGM "fedora-36",
"fedora-37",
"fedora-38",
"fedora-39",
"oraclelinux-7",
"oraclelinux-8",
"photon-3",
"photon-4",
"photon-5",
"rockylinux-8",
"rockylinux-9",
"ubuntu-2004",
@ -125,154 +102,23 @@ ONEDIR_RC_DISTROS = [
"almalinux-8",
"almalinux-9",
"amazon-2",
"amazon-2023",
"centos-7",
"centos-stream8",
"centos-stream9",
"debian-10",
"debian-11",
"debian-12",
"oraclelinux-7",
"oraclelinux-8",
"photon-3",
"photon-4",
"photon-5",
"rockylinux-8",
"rockylinux-9",
"ubuntu-2004",
"ubuntu-2204",
]
BLACKLIST_3003 = [
"almalinux-9",
"amazon-2023",
"arch",
"centos-stream9",
"debian-11",
"debian-12",
## DGM "fedora-36",
"fedora-37",
"fedora-38",
"fedora-39",
"gentoo",
"gentoo-systemd",
"opensuse-15",
"opensuse-tumbleweed",
"photon-3",
"photon-4",
"rockylinux-8",
"rockylinux-9",
"ubuntu-2204",
]
BLACKLIST_GIT_3003 = [
"almalinux-9",
"amazon-2",
"amazon-2023",
"arch",
"centos-stream9",
"debian-10",
"debian-11",
"debian-12",
## DGM "fedora-36",
"fedora-37",
"fedora-38",
"fedora-39",
"gentoo",
"gentoo-systemd",
"opensuse-15",
"opensuse-tumbleweed",
"photon-3",
"photon-4",
"rockylinux-8",
"rockylinux-9",
"ubuntu-2004",
"ubuntu-2110",
"ubuntu-2204",
]
BLACKLIST_3004 = [
"almalinux-9",
"arch",
"centos-stream9",
"debian-12",
## DGM "fedora-36",
"fedora-37",
"fedora-38",
"fedora-39",
"gentoo",
"gentoo-systemd",
"opensuse-15",
"opensuse-tumbleweed",
"photon-3",
"photon-4",
"rockylinux-9",
"ubuntu-2204",
]
BLACKLIST_3005 = [
"almalinux-9",
"arch",
"centos-stream9",
"debian-12",
## DGM "fedora-36",
"fedora-37",
"fedora-38",
"fedora-39",
"gentoo",
"gentoo-systemd",
"opensuse-15",
"opensuse-tumbleweed",
"photon-3",
"photon-4",
"rockylinux-9",
]
BLACKLIST_GIT_3004 = [
"almalinux-9",
"amazon-2",
"amazon-2023",
"arch",
"centos-stream9",
"debian-10",
"debian-11",
"debian-12",
## DGM "fedora-36",
"fedora-37",
"fedora-38",
"fedora-39",
"gentoo",
"gentoo-systemd",
"opensuse-15",
"opensuse-tumbleweed",
"ubuntu-2004",
"ubuntu-2110",
"ubuntu-2204",
"rockylinux-9",
"photon-3",
"photon-4",
"ubuntu-2204",
]
BLACKLIST_GIT_3005 = [
"amazon-2",
"amazon-2023",
"arch",
"debian-10",
"debian-11",
"debian-12",
## DGM "fedora-36",
"fedora-37",
"fedora-38",
"fedora-39",
"gentoo",
"gentoo-systemd",
"opensuse-15",
"opensuse-tumbleweed",
"photon-3",
"photon-4",
"ubuntu-2004",
"ubuntu-2110",
"ubuntu-2204",
]
BLACKLIST_3006 = [
"arch",
"gentoo",
@ -289,20 +135,18 @@ BLACKLIST_GIT_3006 = [
"debian-10",
"debian-11",
"debian-12",
## DGM "fedora-36",
"fedora-37",
"fedora-38",
"fedora-39",
"gentoo",
"gentoo-systemd",
"opensuse-15",
"opensuse-tumbleweed",
"photon-3",
"photon-4",
"photon-5",
"rockylinux-9",
"ubuntu-2004",
"ubuntu-2110",
"ubuntu-2204",
"ubuntu-2310",
]
BLACKLIST_GIT_MASTER = [
@ -310,23 +154,17 @@ BLACKLIST_GIT_MASTER = [
"debian-10",
"freebsd-131",
"freebsd-123",
"photon-3",
]
SALT_VERSIONS = [
"3003",
"3004",
"3005",
"3005-5",
"3006",
"3006-1",
"3006-6",
"master",
"latest",
"nightly",
]
ONEDIR_SALT_VERSIONS = [
"3005",
"3006",
"latest",
]
@ -334,54 +172,25 @@ ONEDIR_SALT_VERSIONS = [
ONEDIR_RC_SALT_VERSIONS = []
VERSION_DISPLAY_NAMES = {
"3003": "v3003",
"3004": "v3004",
"3005": "v3005",
"3005-5": "v3005.5",
"3006": "v3006",
"3006-1": "v3006.1",
"3006-6": "v3006.6",
"master": "Master",
"latest": "Latest",
"nightly": "Nightly",
}
OLD_STABLE_VERSION_BLACKLIST = [
"3005-5",
"3006",
"3006-1",
"master",
"nightly",
]
STABLE_VERSION_BLACKLIST = [
"3003",
"3004",
"master",
"nightly",
]
MAC_OLD_STABLE_VERSION_BLACKLIST = [
"3005-5",
"3006",
"3006-1",
"3006-6",
"master",
"nightly",
]
MAC_STABLE_VERSION_BLACKLIST = [
"3003",
"3004",
"3005",
"3005-5",
"master",
"nightly",
]
GIT_VERSION_BLACKLIST = [
"3005-5",
"3006-1",
"3006-6",
"nightly",
]
@ -398,7 +207,6 @@ GIT_DISTRO_BLACKLIST = [
"almalinux-8",
"centos-7",
"centos-stream8",
"fedora-37",
"fedora-38",
"fedora-39",
"opensuse-15",
@ -424,8 +232,6 @@ DISTRO_DISPLAY_NAMES = {
"debian-10": "Debian 10",
"debian-11": "Debian 11",
"debian-12": "Debian 12",
## DGM "fedora-36": "Fedora 36",
"fedora-37": "Fedora 37",
"fedora-38": "Fedora 38",
"fedora-39": "Fedora 39",
"gentoo": "Gentoo",
@ -434,15 +240,14 @@ DISTRO_DISPLAY_NAMES = {
"opensuse-tumbleweed": "Opensuse Tumbleweed",
"oraclelinux-7": "Oracle Linux 7",
"oraclelinux-8": "Oracle Linux 8",
"photon-3": "Photon OS 3",
"photon-4": "Photon OS 4",
"photon-5": "Photon OS 5",
"rockylinux-8": "Rocky Linux 8",
"rockylinux-9": "Rocky Linux 9",
"ubuntu-2004": "Ubuntu 20.04",
"ubuntu-2204": "Ubuntu 22.04",
"macos-1015": "macOS 10.15",
"macos-11": "macOS 11",
"macos-12": "macOS 12",
"macos-13": "macOS 13",
"freebsd-131": "FreeBSD 13.1",
"freebsd-123": "FreeBSD 12.3",
"openbsd-7": "OpenBSD 7",
@ -509,29 +314,21 @@ def generate_test_jobs():
continue
# BSD's don't have a stable release, only use git
for bootstrap_type in ("git",):
for bootstrap_type in ["git"]:
BLACKLIST = {
"3003": BLACKLIST_3003,
"3004": BLACKLIST_3004,
}
BLACKLIST = {}
if bootstrap_type == "git":
BLACKLIST = {
"3003": BLACKLIST_GIT_3003,
"3004": BLACKLIST_GIT_3004,
"master": BLACKLIST_GIT_MASTER,
}
# .0 versions are a virtual version for pinning to the first
# point release of a major release, such as 3003,
# point release of a major release, such as 3006,
# there is no git version.
if salt_version.endswith("-0"):
continue
if (
salt_version in ("3003", "3004", "master")
and distro in BLACKLIST[salt_version]
):
if salt_version in ("master") and distro in BLACKLIST[salt_version]:
continue
kitchen_target = f"{bootstrap_type}-{salt_version}"
@ -552,10 +349,7 @@ def generate_test_jobs():
test_jobs += "\n"
for distro in OSX:
test_jobs += "\n"
if distro == "macos-1015":
runs_on = "macos-10.15"
else:
runs_on = distro
runs_on = distro
runs_on = f"\n runs-on: {runs_on}"
ifcheck = "\n if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'"
uses = "./.github/workflows/test-macos.yml"
@ -567,25 +361,19 @@ def generate_test_jobs():
)
for salt_version in SALT_VERSIONS:
if salt_version == "latest":
instances.append(salt_version)
continue
for bootstrap_type in ("stable", "old-stable"):
for bootstrap_type in ["stable"]:
if bootstrap_type == "stable":
if salt_version in MAC_STABLE_VERSION_BLACKLIST:
continue
if bootstrap_type == "old-stable":
if salt_version in MAC_OLD_STABLE_VERSION_BLACKLIST:
continue
kitchen_target = f"{bootstrap_type}-{salt_version}"
instances.append(kitchen_target)
for bootstrap_type in ("default",):
for bootstrap_type in ["default"]:
if distro not in STABLE_DISTROS:
continue
instances.append(bootstrap_type)
@ -622,7 +410,7 @@ def generate_test_jobs():
instances.append(salt_version)
continue
for bootstrap_type in ("stable",):
for bootstrap_type in ["stable"]:
if bootstrap_type == "stable":
if salt_version in STABLE_VERSION_BLACKLIST:
continue
@ -630,7 +418,7 @@ def generate_test_jobs():
kitchen_target = f"{bootstrap_type}-{salt_version}"
instances.append(kitchen_target)
for bootstrap_type in ("default",):
for bootstrap_type in ["default"]:
if distro not in STABLE_DISTROS:
continue
instances.append(bootstrap_type)
@ -672,7 +460,6 @@ def generate_test_jobs():
continue
for bootstrap_type in (
"old-stable",
"stable",
"git",
"onedir",
@ -690,12 +477,6 @@ def generate_test_jobs():
if distro not in ONEDIR_RC_DISTROS:
continue
if bootstrap_type == "old-stable":
if salt_version in OLD_STABLE_VERSION_BLACKLIST:
continue
if distro not in OLD_STABLE_DISTROS:
continue
if bootstrap_type == "stable":
if salt_version in STABLE_VERSION_BLACKLIST:
continue
@ -709,18 +490,11 @@ def generate_test_jobs():
continue
BLACKLIST = {
"3003": BLACKLIST_3003,
"3004": BLACKLIST_3004,
"3005": BLACKLIST_3005,
"3005-5": BLACKLIST_3005,
"3006": BLACKLIST_3006,
"3006-1": BLACKLIST_3006,
"3006-6": BLACKLIST_3006,
}
if bootstrap_type == "git":
BLACKLIST = {
"3003": BLACKLIST_GIT_3003,
"3004": BLACKLIST_GIT_3004,
"3005": BLACKLIST_GIT_3005,
"3006": BLACKLIST_GIT_3006,
"master": BLACKLIST_GIT_MASTER,
}
@ -732,8 +506,7 @@ def generate_test_jobs():
continue
if (
salt_version
in ("3003", "3004", "3005", "3005-5", "3006", "3006-1", "master")
salt_version in ("3006", "3006-6", "master")
and distro in BLACKLIST[salt_version]
):
continue
@ -741,7 +514,7 @@ def generate_test_jobs():
kitchen_target = f"{bootstrap_type}-{salt_version}"
instances.append(kitchen_target)
for bootstrap_type in ("default",):
for bootstrap_type in ["default"]:
if distro not in STABLE_DISTROS:
continue
instances.append(bootstrap_type)

1792
bootstrap-salt.sh
View file

File diff suppressed because it is too large Load diff

21
kitchen.macos.yml
View file

@ -14,32 +14,15 @@ provisioner:
platforms:
- name: macos-12
- name: macos-11
- name: macos-1015
suites:
- name: old-stable-3003
provisioner:
salt_bootstrap_options: -MP old-stable %s
salt_version: 3003.4
salt_call_command: /opt/salt/bin/salt-call
- name: old-stable-3004
provisioner:
salt_bootstrap_options: -MP old-stable %s
salt_version: 3004.1
salt_call_command: /opt/salt/bin/salt-call
- name: old-stable-3005
provisioner:
salt_bootstrap_options: -MP old-stable %s
salt_version: 3005.5
salt_call_command: /opt/salt/bin/salt-call
- name: stable-3006
provisioner:
salt_version: 3006
salt_call_command: /opt/salt/salt-call
- name: stable-3006-1
- name: stable-3006-6
provisioner:
salt_version: 3006.1
salt_version: 3006.6
salt_call_command: /opt/salt/salt-call
- name: latest
provisioner:

20
kitchen.windows.yml
View file

@ -17,27 +17,13 @@ platforms:
- name: windows-2019
suites:
- name: stable-3003
provisioner:
salt_version: 3003.4-1
salt_call_command: c:\salt\salt-call.bat
- name: stable-3004
provisioner:
salt_version: 3004.1-1
salt_call_command: c:\Program Files\Salt Project\Salt\salt-call.bat
- name: stable-3005
provisioner:
salt_version: 3005.5-1
- name: stable-3005-1
provisioner:
salt_version: 3005.5-1
- name: stable-3006
provisioner:
salt_version: 3006.0
salt_version: 3006.6
salt_call_command: c:\Program Files\Salt Project\Salt\salt-call.exe
- name: stable-3006-1
- name: stable-3006-6
provisioner:
salt_version: 3006.1
salt_version: 3006.6
salt_call_command: c:\Program Files\Salt Project\Salt\salt-call.exe
- name: latest
provisioner:

164
kitchen.yml
View file

@ -66,7 +66,6 @@ platforms:
- name: centos-stream8
driver:
image: quay.io/centos/centos:stream8
## DGM - name: debian-9
- name: centos-7
driver:
run_command: /lib/systemd/systemd
@ -81,17 +80,6 @@ platforms:
driver:
image: debian:bullseye
run_command: /lib/systemd/systemd
## DGM - name: fedora-35
## DGM driver:
## DGM provision_command: &fedora_provision_command
## DGM - dnf -y install procps-ng crypto-policies-scripts
## DGM - update-crypto-policies --set LEGACY
## DGM - name: fedora-36
## DGM driver:
## DGM provision_command: *fedora_provision_command
- name: fedora-37
driver:
provision_command: *fedora_provision_command
- name: fedora-38
driver:
provision_command: *fedora_provision_command
@ -144,15 +132,12 @@ platforms:
run_command: /lib/systemd/systemd
provision_command:
- echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config
- name: ubuntu-21.10
- name: ubuntu-23.10
driver:
run_command: /lib/systemd/systemd
- name: ubuntu-20.04
driver:
run_command: /lib/systemd/systemd
- name: ubuntu-18.04
driver:
run_command: /lib/systemd/systemd
- name: photon-3
driver:
image: photon:3.0
@ -171,40 +156,6 @@ platforms:
- systemctl enable sshd.service
suites:
- name: git-3003
provisioner:
salt_version: v3003
salt_bootstrap_options: -x python3 -MPfq git %s
- name: git-3004
provisioner:
salt_version: v3004
salt_bootstrap_options: -x python3 -MPfq git %s
excludes:
- opensuse-15
- opensuse-tumbleweed
- debian-11
- debian-12
- arch
- gentoo
- gentoo-systemd
- freebsd-131
- freebsd-123
- openbsd-6
- name: git-3005
provisioner:
salt_version: v3005
salt_bootstrap_options: -x python3 -MPfq git %s
excludes:
- opensuse-15
- opensuse-tumbleweed
- debian-11
- debian-12
- arch
- gentoo
- gentoo-systemd
- freebsd-131
- freebsd-123
- openbsd-6
- name: git-3006
provisioner:
salt_version: v3006
@ -232,94 +183,6 @@ suites:
- freebsd-131
- freebsd-123
- openbsd-6
- name: old-stable-3003-0
provisioner:
salt_version: 3003
salt_bootstrap_options: -x python3 -MP old-stable 3003.0
excludes:
- opensuse-15
- opensuse-tumbleweed
- arch
- gentoo
- gentoo-systemd
- freebsd-131
- freebsd-123
- openbsd-6
excludes:
- opensuse-15
- opensuse-tumbleweed
- arch
- freebsd-131
- freebsd-123
- openbsd-6
- name: old-stable-3003
provisioner:
salt_version: 3003
salt_bootstrap_options: -x python3 -MP old-stable %s
excludes:
- opensuse-15
- opensuse-tumbleweed
- arch
- freebsd-131
- freebsd-123
- openbsd-6
- name: old-stable-3004-0
provisioner:
salt_version: 3004
salt_bootstrap_options: -x python3 -MP old-stable 3004.0
excludes:
- opensuse-15
- opensuse-tumbleweed
- arch
- gentoo
- gentoo-systemd
- freebsd-131
- freebsd-123
- openbsd-6
- name: old-stable-3004
provisioner:
salt_version: 3004
salt_bootstrap_options: -x python3 -MP old-stable %s
excludes:
- opensuse-15
- opensuse-tumbleweed
- arch
- freebsd-131
- freebsd-123
- openbsd-6
- name: old-stable-3005
provisioner:
salt_version: 3005
salt_bootstrap_options: -x python3 -MP old-stable %s
excludes:
- opensuse-15
- opensuse-tumbleweed
- arch
- freebsd-131
- freebsd-123
- openbsd-6
- name: stable-3005
provisioner:
salt_version: 3005
salt_bootstrap_options: -x python3 -MP stable %s
excludes:
- opensuse-15
- opensuse-tumbleweed
- arch
- freebsd-131
- freebsd-123
- openbsd-6
- name: stable-3005-1
provisioner:
salt_version: 3005.5
salt_bootstrap_options: -x python3 -MP stable %s
excludes:
- opensuse-15
- opensuse-tumbleweed
- arch
- freebsd-131
- freebsd-123
- openbsd-6
- name: stable-3006
provisioner:
salt_version: 3006
@ -331,17 +194,6 @@ suites:
- freebsd-131
- freebsd-123
- openbsd-6
- name: stable-3006-1
provisioner:
salt_version: 3006.1
salt_bootstrap_options: -x python3 -MP stable %s
excludes:
- opensuse-15
- opensuse-tumbleweed
- arch
- freebsd-131
- freebsd-123
- openbsd-6
- name: stable-3006-6
provisioner:
salt_version: 3006.6
@ -388,20 +240,6 @@ suites:
salt_version: 3006
salt_bootstrap_options: -MP onedir %s
## DGM - name: onedir-rc-3006-0rc2
## DGM provisioner:
## DGM salt_version: 3006.0rc2
## DGM salt_bootstrap_options: -R staging.repo.saltproject.io -MP onedir_rc %s
## DGM excludes:
## DGM - arch
## DGM - freebsd-131
## DGM - freebsd-123
## DGM - gentoo
## DGM - openbsd-6
## DGM - opensuse-15
## DGM - opensuse-tumbleweed
## DGM - ubuntu-1804
- name: onedir-rc-3007-0rc1
provisioner:
salt_version: 3007.0rc1