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

Merge develop into stable for v2023.06.28 release

Browse source
This commit is contained in:
Salt Project Packaging 2023-06-28 20:27:53 +00:00
commit 42475f735f
No known key found for this signature in database
GPG key ID: 64CBBC8173D76B3F
10 changed files with 292 additions and 97 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -126,8 +126,8 @@ jobs:
distro-slug: freebsd-131 distro-slug: freebsd-131
display-name: FreeBSD 13.1 display-name: FreeBSD 13.1
timeout: 20 timeout: 20
runs-on: macos-10.15 runs-on: macos-12
instances: '["git-master", "latest"]' instances: '["latest"]'
freebsd-123: freebsd-123:
@ -141,8 +141,8 @@ jobs:
distro-slug: freebsd-123 distro-slug: freebsd-123
display-name: FreeBSD 12.3 display-name: FreeBSD 12.3
timeout: 20 timeout: 20
runs-on: macos-10.15 runs-on: macos-12
instances: '["git-master", "latest"]' instances: '["latest"]'
openbsd-7: openbsd-7:
@ -156,26 +156,11 @@ jobs:
distro-slug: openbsd-7 distro-slug: openbsd-7
display-name: OpenBSD 7 display-name: OpenBSD 7
timeout: 20 timeout: 20
runs-on: macos-10.15 runs-on: macos-12
instances: '["latest"]' instances: '["latest"]'
macos-1015:
name: macOS 10.15
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-1015
display-name: macOS 10.15
timeout: 20
runs-on: macos-10.15
instances: '["stable-3003", "stable-3004", "stable-3005", "stable-3006", "latest"]'
macos-11: macos-11:
name: macOS 11 name: macOS 11
if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true' if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
@ -188,7 +173,7 @@ jobs:
display-name: macOS 11 display-name: macOS 11
timeout: 20 timeout: 20
runs-on: macos-11 runs-on: macos-11
instances: '["stable-3003", "stable-3004", "stable-3005", "stable-3006", "latest"]' instances: '["old-stable-3003", "old-stable-3004", "old-stable-3005", "stable-3006", "stable-3006-1", "latest"]'
macos-12: macos-12:
@ -203,7 +188,7 @@ jobs:
display-name: macOS 12 display-name: macOS 12
timeout: 20 timeout: 20
runs-on: macos-12 runs-on: macos-12
instances: '["stable-3003", "stable-3004", "stable-3005", "stable-3006", "latest"]' instances: '["old-stable-3003", "old-stable-3004", "old-stable-3005", "stable-3006", "stable-3006-1", "latest"]'
@ -219,7 +204,7 @@ jobs:
display-name: Windows 2019 display-name: Windows 2019
timeout: 20 timeout: 20
runs-on: windows-2019 runs-on: windows-2019
instances: '["stable-3003", "stable-3004", "stable-3005", "stable-3006", "latest"]' instances: '["stable-3005", "stable-3005-1", "stable-3006", "stable-3006-1", "latest"]'
windows-2022: windows-2022:
@ -234,7 +219,7 @@ jobs:
display-name: Windows 2022 display-name: Windows 2022
timeout: 20 timeout: 20
runs-on: windows-2022 runs-on: windows-2022
instances: '["stable-3003", "stable-3004", "stable-3005", "stable-3006", "latest"]' instances: '["stable-3005", "stable-3005-1", "stable-3006", "stable-3006-1", "latest"]'
@ -249,7 +234,7 @@ jobs:
distro-slug: almalinux-8 distro-slug: almalinux-8
display-name: AlmaLinux 8 display-name: AlmaLinux 8
timeout: 20 timeout: 20
instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "stable-3006", "onedir-3006", "latest", "default"]' instances: '["old-stable-3003", "old-stable-3004", "old-stable-3005", "stable-3005", "onedir-3005", "stable-3005-1", "stable-3006", "onedir-3006", "stable-3006-1", "latest", "default"]'
almalinux-9: almalinux-9:
@ -263,7 +248,7 @@ jobs:
distro-slug: almalinux-9 distro-slug: almalinux-9
display-name: AlmaLinux 9 display-name: AlmaLinux 9
timeout: 20 timeout: 20
instances: '["git-3005", "stable-3006", "onedir-3006", "git-master", "latest", "default"]' instances: '["git-3005", "stable-3006", "onedir-3006", "stable-3006-1", "git-master", "latest", "default"]'
amazon-2: amazon-2:
@ -277,7 +262,7 @@ jobs:
distro-slug: amazon-2 distro-slug: amazon-2
display-name: Amazon 2 display-name: Amazon 2
timeout: 20 timeout: 20
instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "stable-3006", "onedir-3006", "git-master", "latest", "default"]' instances: '["old-stable-3003", "old-stable-3004", "old-stable-3005", "stable-3005", "onedir-3005", "stable-3005-1", "stable-3006", "onedir-3006", "stable-3006-1", "latest", "default"]'
arch: arch:
@ -305,7 +290,7 @@ jobs:
distro-slug: centos-7 distro-slug: centos-7
display-name: CentOS 7 display-name: CentOS 7
timeout: 20 timeout: 20
instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "stable-3006", "onedir-3006", "latest", "default"]' instances: '["old-stable-3003", "old-stable-3004", "old-stable-3005", "stable-3005", "onedir-3005", "stable-3005-1", "stable-3006", "onedir-3006", "stable-3006-1", "latest", "default"]'
centos-stream8: centos-stream8:
@ -319,7 +304,7 @@ jobs:
distro-slug: centos-stream8 distro-slug: centos-stream8
display-name: CentOS Stream 8 display-name: CentOS Stream 8
timeout: 20 timeout: 20
instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "stable-3006", "onedir-3006", "latest", "default"]' instances: '["old-stable-3003", "old-stable-3004", "old-stable-3005", "stable-3005", "onedir-3005", "stable-3005-1", "stable-3006", "onedir-3006", "stable-3006-1", "latest", "default"]'
centos-stream9: centos-stream9:
@ -333,7 +318,7 @@ jobs:
distro-slug: centos-stream9 distro-slug: centos-stream9
display-name: CentOS Stream 9 display-name: CentOS Stream 9
timeout: 20 timeout: 20
instances: '["git-3005", "stable-3006", "onedir-3006", "git-master", "latest", "default"]' instances: '["git-3005", "stable-3006", "onedir-3006", "stable-3006-1", "git-master", "latest", "default"]'
debian-10: debian-10:
@ -347,7 +332,7 @@ jobs:
distro-slug: debian-10 distro-slug: debian-10
display-name: Debian 10 display-name: Debian 10
timeout: 20 timeout: 20
instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "stable-3006", "onedir-3006", "git-master", "latest", "default"]' instances: '["old-stable-3003", "old-stable-3004", "old-stable-3005", "stable-3005", "onedir-3005", "stable-3005-1", "stable-3006", "onedir-3006", "stable-3006-1", "latest", "default"]'
debian-11: debian-11:
@ -361,7 +346,7 @@ jobs:
distro-slug: debian-11 distro-slug: debian-11
display-name: Debian 11 display-name: Debian 11
timeout: 20 timeout: 20
instances: '["stable-3004", "stable-3005", "onedir-3005", "stable-3006", "onedir-3006", "git-master", "latest", "default"]' instances: '["old-stable-3004", "old-stable-3005", "stable-3005", "onedir-3005", "stable-3005-1", "stable-3006", "onedir-3006", "stable-3006-1", "git-master", "latest", "default"]'
fedora-36: fedora-36:
@ -375,7 +360,7 @@ jobs:
distro-slug: fedora-36 distro-slug: fedora-36
display-name: Fedora 36 display-name: Fedora 36
timeout: 20 timeout: 20
instances: '["stable-3006", "onedir-3006", "git-master", "latest", "default"]' instances: '["stable-3006", "onedir-3006", "stable-3006-1", "git-master", "latest", "default"]'
fedora-37: fedora-37:
@ -389,7 +374,7 @@ jobs:
distro-slug: fedora-37 distro-slug: fedora-37
display-name: Fedora 37 display-name: Fedora 37
timeout: 20 timeout: 20
instances: '["stable-3006", "onedir-3006", "latest", "default"]' instances: '["stable-3006", "onedir-3006", "stable-3006-1", "latest", "default"]'
fedora-38: fedora-38:
@ -403,7 +388,7 @@ jobs:
distro-slug: fedora-38 distro-slug: fedora-38
display-name: Fedora 38 display-name: Fedora 38
timeout: 20 timeout: 20
instances: '["stable-3006", "onedir-3006", "latest", "default"]' instances: '["stable-3006", "onedir-3006", "stable-3006-1", "latest", "default"]'
gentoo: gentoo:
@ -417,7 +402,7 @@ jobs:
distro-slug: gentoo distro-slug: gentoo
display-name: Gentoo display-name: Gentoo
timeout: 90 timeout: 90
instances: '["git-master", "latest", "default"]' instances: '["git-master"]'
gentoo-systemd: gentoo-systemd:
@ -431,7 +416,7 @@ jobs:
distro-slug: gentoo-systemd distro-slug: gentoo-systemd
display-name: Gentoo (systemd) display-name: Gentoo (systemd)
timeout: 90 timeout: 90
instances: '["git-master", "latest", "default"]' instances: '["git-master"]'
opensuse-15: opensuse-15:
@ -473,7 +458,7 @@ jobs:
distro-slug: oraclelinux-7 distro-slug: oraclelinux-7
display-name: Oracle Linux 7 display-name: Oracle Linux 7
timeout: 20 timeout: 20
instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "stable-3006", "onedir-3006", "latest", "default"]' instances: '["old-stable-3003", "old-stable-3004", "old-stable-3005", "stable-3005", "onedir-3005", "stable-3005-1", "stable-3006", "onedir-3006", "stable-3006-1", "latest", "default"]'
oraclelinux-8: oraclelinux-8:
@ -487,7 +472,7 @@ jobs:
distro-slug: oraclelinux-8 distro-slug: oraclelinux-8
display-name: Oracle Linux 8 display-name: Oracle Linux 8
timeout: 20 timeout: 20
instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "stable-3006", "onedir-3006", "latest", "default"]' instances: '["old-stable-3003", "old-stable-3004", "old-stable-3005", "stable-3005", "onedir-3005", "stable-3005-1", "stable-3006", "onedir-3006", "stable-3006-1", "latest", "default"]'
photon-3: photon-3:
@ -501,7 +486,7 @@ jobs:
distro-slug: photon-3 distro-slug: photon-3
display-name: Photon OS 3 display-name: Photon OS 3
timeout: 20 timeout: 20
instances: '["stable-3006", "onedir-3006", "git-master", "latest", "default"]' instances: '["stable-3006", "onedir-3006", "stable-3006-1", "git-master", "latest", "default"]'
photon-4: photon-4:
@ -515,7 +500,7 @@ jobs:
distro-slug: photon-4 distro-slug: photon-4
display-name: Photon OS 4 display-name: Photon OS 4
timeout: 20 timeout: 20
instances: '["stable-3006", "onedir-3006", "git-master", "latest", "default"]' instances: '["stable-3006", "onedir-3006", "stable-3006-1", "git-master", "latest", "default"]'
rockylinux-8: rockylinux-8:
@ -529,7 +514,7 @@ jobs:
distro-slug: rockylinux-8 distro-slug: rockylinux-8
display-name: Rocky Linux 8 display-name: Rocky Linux 8
timeout: 20 timeout: 20
instances: '["stable-3004", "stable-3005", "onedir-3005", "stable-3006", "onedir-3006", "latest", "default"]' instances: '["old-stable-3004", "old-stable-3005", "stable-3005", "onedir-3005", "stable-3005-1", "stable-3006", "onedir-3006", "stable-3006-1", "latest", "default"]'
rockylinux-9: rockylinux-9:
@ -543,7 +528,7 @@ jobs:
distro-slug: rockylinux-9 distro-slug: rockylinux-9
display-name: Rocky Linux 9 display-name: Rocky Linux 9
timeout: 20 timeout: 20
instances: '["git-3005", "stable-3006", "onedir-3006", "git-master", "latest", "default"]' instances: '["git-3005", "stable-3006", "onedir-3006", "stable-3006-1", "git-master", "latest", "default"]'
ubuntu-2004: ubuntu-2004:
@ -557,7 +542,7 @@ jobs:
distro-slug: ubuntu-2004 distro-slug: ubuntu-2004
display-name: Ubuntu 20.04 display-name: Ubuntu 20.04
timeout: 20 timeout: 20
instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "stable-3006", "onedir-3006", "git-master", "latest", "default"]' instances: '["old-stable-3003", "old-stable-3004", "old-stable-3005", "stable-3005", "onedir-3005", "stable-3005-1", "stable-3006", "onedir-3006", "stable-3006-1", "git-master", "latest", "default"]'
ubuntu-2204: ubuntu-2204:
@ -571,7 +556,7 @@ jobs:
distro-slug: ubuntu-2204 distro-slug: ubuntu-2204
display-name: Ubuntu 22.04 display-name: Ubuntu 22.04
timeout: 20 timeout: 20
instances: '["stable-3004", "stable-3005", "onedir-3005", "stable-3006", "onedir-3006", "git-master", "latest", "default"]' instances: '["stable-3005", "onedir-3005", "stable-3005-1", "stable-3006", "onedir-3006", "stable-3006-1", "git-master", "latest", "default"]'
set-pipeline-exit-status: set-pipeline-exit-status:
@ -585,7 +570,6 @@ jobs:
- freebsd-131 - freebsd-131
- freebsd-123 - freebsd-123
- openbsd-7 - openbsd-7
- macos-1015
- macos-11 - macos-11
- macos-12 - macos-12
- windows-2019 - windows-2019

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

@ -38,7 +38,6 @@ WINDOWS = [
] ]
OSX = [ OSX = [
"macos-1015",
"macos-11", "macos-11",
"macos-12", "macos-12",
] ]
@ -48,6 +47,24 @@ BSD = [
"openbsd-7", "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 = [ STABLE_DISTROS = [
"almalinux-8", "almalinux-8",
"almalinux-9", "almalinux-9",
@ -61,8 +78,6 @@ STABLE_DISTROS = [
"fedora-36", "fedora-36",
"fedora-37", "fedora-37",
"fedora-38", "fedora-38",
"gentoo",
"gentoo-systemd",
"opensuse-15", "opensuse-15",
"opensuse-tumbleweed", "opensuse-tumbleweed",
"oraclelinux-7", "oraclelinux-7",
@ -261,13 +276,15 @@ BLACKLIST_GIT_3006 = [
"ubuntu-2204", "ubuntu-2204",
] ]
BLACKLIST_GIT_MASTER = [] BLACKLIST_GIT_MASTER = ["amazon-2", "debian-10", "freebsd-131", "freebsd-123"]
SALT_VERSIONS = [ SALT_VERSIONS = [
"3003", "3003",
"3004", "3004",
"3005", "3005",
"3005-1",
"3006", "3006",
"3006-1",
"master", "master",
"latest", "latest",
"nightly", "nightly",
@ -285,18 +302,49 @@ VERSION_DISPLAY_NAMES = {
"3003": "v3003", "3003": "v3003",
"3004": "v3004", "3004": "v3004",
"3005": "v3005", "3005": "v3005",
"3005-1": "v3005.1",
"3006": "v3006", "3006": "v3006",
"3006-1": "v3006.1",
"master": "Master", "master": "Master",
"latest": "Latest", "latest": "Latest",
"nightly": "Nightly", "nightly": "Nightly",
} }
OLD_STABLE_VERSION_BLACKLIST = [
"3005-1",
"3006",
"3006-1",
"master",
"nightly",
]
STABLE_VERSION_BLACKLIST = [ STABLE_VERSION_BLACKLIST = [
"3003",
"3004",
"master",
"nightly",
]
MAC_OLD_STABLE_VERSION_BLACKLIST = [
"3005-1",
"3006",
"3006-1",
"master",
"nightly",
]
MAC_STABLE_VERSION_BLACKLIST = [
"3003",
"3004",
"3005",
"3005-1",
"master", "master",
"nightly", "nightly",
] ]
GIT_VERSION_BLACKLIST = [ GIT_VERSION_BLACKLIST = [
"3005-1",
"3006-1",
"nightly", "nightly",
] ]
@ -321,7 +369,10 @@ GIT_DISTRO_BLACKLIST = [
"rockylinux-8", "rockylinux-8",
] ]
LATEST_PKG_BLACKLIST = [] LATEST_PKG_BLACKLIST = [
"gentoo",
"gentoo-systemd",
]
DISTRO_DISPLAY_NAMES = { DISTRO_DISPLAY_NAMES = {
"almalinux-8": "AlmaLinux 8", "almalinux-8": "AlmaLinux 8",
@ -389,7 +440,7 @@ def generate_test_jobs():
for distro in BSD: for distro in BSD:
test_jobs += "\n" test_jobs += "\n"
runs_on = "macos-10.15" runs_on = "macos-12"
runs_on = f"\n runs-on: {runs_on}" runs_on = f"\n runs-on: {runs_on}"
ifcheck = "\n if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'" ifcheck = "\n if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'"
uses = "./.github/workflows/test-bsd.yml" uses = "./.github/workflows/test-bsd.yml"
@ -427,6 +478,7 @@ def generate_test_jobs():
BLACKLIST = { BLACKLIST = {
"3003": BLACKLIST_GIT_3003, "3003": BLACKLIST_GIT_3003,
"3004": BLACKLIST_GIT_3004, "3004": BLACKLIST_GIT_3004,
"master": BLACKLIST_GIT_MASTER,
} }
# .0 versions are a virtual version for pinning to the first # .0 versions are a virtual version for pinning to the first
@ -436,7 +488,7 @@ def generate_test_jobs():
continue continue
if ( if (
salt_version in ("3003", "3004") salt_version in ("3003", "3004", "master")
and distro in BLACKLIST[salt_version] and distro in BLACKLIST[salt_version]
): ):
continue continue
@ -480,9 +532,13 @@ def generate_test_jobs():
instances.append(salt_version) instances.append(salt_version)
continue continue
for bootstrap_type in ("stable",): for bootstrap_type in ("stable", "old-stable"):
if bootstrap_type == "stable": if bootstrap_type == "stable":
if salt_version in STABLE_VERSION_BLACKLIST: if salt_version in MAC_STABLE_VERSION_BLACKLIST:
continue
if bootstrap_type == "old-stable":
if salt_version in MAC_OLD_STABLE_VERSION_BLACKLIST:
continue continue
kitchen_target = f"{bootstrap_type}-{salt_version}" kitchen_target = f"{bootstrap_type}-{salt_version}"
@ -574,7 +630,13 @@ def generate_test_jobs():
instances.append(salt_version) instances.append(salt_version)
continue continue
for bootstrap_type in ("stable", "git", "onedir", "onedir-rc"): for bootstrap_type in (
"old-stable",
"stable",
"git",
"onedir",
"onedir-rc",
):
if bootstrap_type == "onedir": if bootstrap_type == "onedir":
if salt_version not in ONEDIR_SALT_VERSIONS: if salt_version not in ONEDIR_SALT_VERSIONS:
continue continue
@ -587,6 +649,12 @@ def generate_test_jobs():
if distro not in ONEDIR_RC_DISTROS: if distro not in ONEDIR_RC_DISTROS:
continue 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 bootstrap_type == "stable":
if salt_version in STABLE_VERSION_BLACKLIST: if salt_version in STABLE_VERSION_BLACKLIST:
continue continue
@ -603,7 +671,9 @@ def generate_test_jobs():
"3003": BLACKLIST_3003, "3003": BLACKLIST_3003,
"3004": BLACKLIST_3004, "3004": BLACKLIST_3004,
"3005": BLACKLIST_3005, "3005": BLACKLIST_3005,
"3005-1": BLACKLIST_3005,
"3006": BLACKLIST_3006, "3006": BLACKLIST_3006,
"3006-1": BLACKLIST_3006,
} }
if bootstrap_type == "git": if bootstrap_type == "git":
BLACKLIST = { BLACKLIST = {
@ -621,7 +691,8 @@ def generate_test_jobs():
continue continue
if ( if (
salt_version in ("3003", "3004", "3005", "3006", "master") salt_version
in ("3003", "3004", "3005", "3005-1", "3006", "3006-1", "master")
and distro in BLACKLIST[salt_version] and distro in BLACKLIST[salt_version]
): ):
continue continue

2
.github/workflows/test-bsd.yml vendored
View file

@ -54,7 +54,7 @@ jobs:
- name: Update Vagrant - name: Update Vagrant
run: | run: |
brew update brew update
brew upgrade vagrant brew upgrade vagrant || brew install vagrant
- name: Setup Vagrant Cache - name: Setup Vagrant Cache
uses: actions/cache@v3 uses: actions/cache@v3

10
CHANGELOG.md
View file

@ -1,3 +1,13 @@
# v2023.06.28
## What's Changed
- SUSE Fixes by @garethgreenaway in https://github.com/saltstack/salt-bootstrap/pull/1925
- Add old_stable type by @garethgreenaway in https://github.com/saltstack/salt-bootstrap/pull/1934
- Test out the minor versions by @garethgreenaway in https://github.com/saltstack/salt-bootstrap/pull/1936
**Full Changelog**: https://github.com/saltstack/salt-bootstrap/compare/v2023.04.26...v2023.06.28
# v2023.04.26 # v2023.04.26
## What's Changed ## What's Changed

1
README.rst
View file

@ -32,6 +32,7 @@ sum** of the downloaded ``bootstrap-salt.sh`` file.
The SHA256 sum of the ``bootstrap-salt.sh`` file, per release, is: The SHA256 sum of the ``bootstrap-salt.sh`` file, per release, is:
- 2023.04.26: ``516fa9cc2e258cb8484ff360b9674b46918f657985c21ca9301e42a3dd263d60``
- 2023.04.21: ``e364428aa7a25f8e2c5e18e36e222351724c6cf35a1d57158f3357cde1e0a0f0`` - 2023.04.21: ``e364428aa7a25f8e2c5e18e36e222351724c6cf35a1d57158f3357cde1e0a0f0``
- 2023.04.06: ``994bf7e8bd92fe6d70d291c7562aff299f5651046b4e76dfa506cee0d9bb0843`` - 2023.04.06: ``994bf7e8bd92fe6d70d291c7562aff299f5651046b4e76dfa506cee0d9bb0843``
- 2022.10.04: ``d0686c2daeed18bb726e58eef75a69afe9ee56a1a23b2c32cd4e87d6005638e2`` - 2022.10.04: ``d0686c2daeed18bb726e58eef75a69afe9ee56a1a23b2c32cd4e87d6005638e2``

124
bootstrap-salt.sh
View file

@ -23,7 +23,7 @@
#====================================================================================================================== #======================================================================================================================
set -o nounset # Treat unset variables as an error set -o nounset # Treat unset variables as an error
__ScriptVersion="2023.04.26" __ScriptVersion="2023.06.28"
__ScriptName="bootstrap-salt.sh" __ScriptName="bootstrap-salt.sh"
__ScriptFullName="$0" __ScriptFullName="$0"
@ -224,7 +224,6 @@ _KEEP_TEMP_FILES=${BS_KEEP_TEMP_FILES:-$BS_FALSE}
_TEMP_CONFIG_DIR="null" _TEMP_CONFIG_DIR="null"
_SALTSTACK_REPO_URL="https://github.com/saltstack/salt.git" _SALTSTACK_REPO_URL="https://github.com/saltstack/salt.git"
_SALT_REPO_URL=${_SALTSTACK_REPO_URL} _SALT_REPO_URL=${_SALTSTACK_REPO_URL}
_DOWNSTREAM_PKG_REPO=$BS_FALSE
_TEMP_KEYS_DIR="null" _TEMP_KEYS_DIR="null"
_SLEEP="${__DEFAULT_SLEEP}" _SLEEP="${__DEFAULT_SLEEP}"
_INSTALL_MASTER=$BS_FALSE _INSTALL_MASTER=$BS_FALSE
@ -311,21 +310,31 @@ __usage() {
- onedir_rc Install latest onedir RC release. - onedir_rc Install latest onedir RC release.
- onedir_rc [version] Install a specific version. Only supported for - onedir_rc [version] Install a specific version. Only supported for
onedir RC packages available at repo.saltproject.io onedir RC packages available at repo.saltproject.io
- old-stable Install latest old stable release.
- old-stable [branch] Install latest version on a branch. Only supported
for packages available at repo.saltproject.io
- old-stable [version] Install a specific version. Only supported for
packages available at repo.saltproject.io
To pin a 3xxx minor version, specify it as 3xxx.0
Examples: Examples:
- ${__ScriptName} - ${__ScriptName}
- ${__ScriptName} stable - ${__ScriptName} stable
- ${__ScriptName} stable 2017.7 - ${__ScriptName} stable 3006
- ${__ScriptName} stable 2017.7.2 - ${__ScriptName} stable 3006.1
- ${__ScriptName} testing - ${__ScriptName} testing
- ${__ScriptName} git - ${__ScriptName} git
- ${__ScriptName} git 2017.7 - ${__ScriptName} git 2017.7
- ${__ScriptName} git v2017.7.2 - ${__ScriptName} git v2017.7.2
- ${__ScriptName} git 06f249901a2e2f1ed310d58ea3921a129f214358 - ${__ScriptName} git 06f249901a2e2f1ed310d58ea3921a129f214358
- ${__ScriptName} onedir - ${__ScriptName} onedir
- ${__ScriptName} onedir 3005 - ${__ScriptName} onedir 3006
- ${__ScriptName} onedir_rc - ${__ScriptName} onedir_rc
- ${__ScriptName} onedir_rc 3005 - ${__ScriptName} onedir_rc 3006
- ${__ScriptName} old-stable
- ${__ScriptName} old-stable 3005
- ${__ScriptName} old-stable 3005.1
Options: Options:
-a Pip install all Python pkg dependencies for Salt. Requires -V to install -a Pip install all Python pkg dependencies for Salt. Requires -V to install
@ -401,9 +410,6 @@ __usage() {
-v Display script version -v Display script version
-V Install Salt into virtualenv -V Install Salt into virtualenv
(only available for Ubuntu based distributions) (only available for Ubuntu based distributions)
-w Install packages from downstream package repository rather than
upstream, saltstack package repository. This is currently only
implemented for SUSE.
-x Changes the Python version used to install Salt. -x Changes the Python version used to install Salt.
For CentOS 6 git installations python2.7 is supported. For CentOS 6 git installations python2.7 is supported.
Fedora git installation, CentOS 7, Ubuntu 18.04 support python3. Fedora git installation, CentOS 7, Ubuntu 18.04 support python3.
@ -420,7 +426,7 @@ EOT
} # ---------- end of function __usage ---------- } # ---------- end of function __usage ----------
while getopts ':hvnDc:g:Gyx:wk:s:MSNXCPFUKIA:i:Lp:dH:bflV:J:j:rR:aq' opt while getopts ':hvnDc:g:Gyx:k:s:MSNXCPFUKIA:i:Lp:dH:bflV:J:j:rR:aq' opt
do do
case "${opt}" in case "${opt}" in
@ -436,7 +442,6 @@ do
echowarn "No need to provide this option anymore, now it is a default behavior." echowarn "No need to provide this option anymore, now it is a default behavior."
;; ;;
w ) _DOWNSTREAM_PKG_REPO=$BS_TRUE ;;
k ) _TEMP_KEYS_DIR="$OPTARG" ;; k ) _TEMP_KEYS_DIR="$OPTARG" ;;
s ) _SLEEP=$OPTARG ;; s ) _SLEEP=$OPTARG ;;
M ) _INSTALL_MASTER=$BS_TRUE ;; M ) _INSTALL_MASTER=$BS_TRUE ;;
@ -595,7 +600,7 @@ if [ "$#" -gt 0 ];then
fi fi
# Check installation type # Check installation type
if [ "$(echo "$ITYPE" | grep -E '(stable|testing|git|onedir|onedir_rc)')" = "" ]; then if [ "$(echo "$ITYPE" | grep -E '(stable|testing|git|onedir|onedir_rc|old-stable)')" = "" ]; then
echoerror "Installation type \"$ITYPE\" is not known..." echoerror "Installation type \"$ITYPE\" is not known..."
exit 1 exit 1
fi fi
@ -619,28 +624,41 @@ elif [ "$ITYPE" = "stable" ]; then
_ONEDIR_REV="latest" _ONEDIR_REV="latest"
ITYPE="onedir" ITYPE="onedir"
else else
if [ "$(echo "$1" | grep -E '^(nightly|latest|3006)$')" != "" ]; then if [ "$(echo "$1" | grep -E '^(nightly|latest|3005|3006)$')" != "" ]; then
ONEDIR_REV="$1" ONEDIR_REV="$1"
_ONEDIR_REV="$1" _ONEDIR_REV="$1"
ITYPE="onedir" ITYPE="onedir"
shift shift
elif [ "$(echo "$1" | grep -E '^(3003|3004|3005)$')" != "" ]; then elif [ "$(echo "$1" | grep -E '^([3-9][0-5]{2}[5-9](\.[0-9]*)?)')" != "" ]; then
STABLE_REV="$1"
shift
elif [ "$(echo "$1" | grep -E '^([3-9][0-5]{2}[6-9](\.[0-9]*)?)')" != "" ]; then
ONEDIR_REV="minor/$1" ONEDIR_REV="minor/$1"
_ONEDIR_REV="$1" _ONEDIR_REV="$1"
ITYPE="onedir" ITYPE="onedir"
shift shift
else
echo "Unknown stable version: $1 (valid: 3005, 3006, latest)"
exit 1
fi
fi
# If doing old-stable install, check if version specified
elif [ "$ITYPE" = "old-stable" ]; then
if [ "$#" -eq 0 ];then
ITYPE="stable"
else
if [ "$(echo "$1" | grep -E '^(3003|3004|3005)$')" != "" ]; then
STABLE_REV="$1"
ITYPE="stable"
shift
elif [ "$(echo "$1" | grep -E '^([3-9][0-5]{3}(\.[0-9]*)?)$')" != "" ]; then elif [ "$(echo "$1" | grep -E '^([3-9][0-5]{3}(\.[0-9]*)?)$')" != "" ]; then
# Handle the 3xxx.0 version as 3xxx archive (pin to minor) and strip the fake ".0" suffix # Handle the 3xxx.0 version as 3xxx archive (pin to minor) and strip the fake ".0" suffix
ITYPE="stable"
STABLE_REV=$(echo "$1" | sed -E 's/^([3-9][0-9]{3})\.0$/\1/') STABLE_REV=$(echo "$1" | sed -E 's/^([3-9][0-9]{3})\.0$/\1/')
if [ "$(uname)" != "Darwin" ]; then if [ "$(uname)" != "Darwin" ]; then
STABLE_REV="archive/$STABLE_REV" STABLE_REV="archive/$STABLE_REV"
fi fi
shift shift
else else
echo "Unknown stable version: $1 (valid: 3003, 3004, 3005, 3006, latest)" echo "Unknown old stable version: $1 (valid: 3003, 3004, 3005)"
exit 1 exit 1
fi fi
fi fi
@ -4573,6 +4591,12 @@ install_fedora_onedir_post() {
# CentOS Install Functions # CentOS Install Functions
# #
__install_saltstack_rhel_repository() { __install_saltstack_rhel_repository() {
if [ "${DISTRO_MAJOR_VERSION}" -ge 9 ]; then
echoerror "Old stable repository unavailable on RH variants greater than or equal to 9"
echoerror "Use the stable install type."
exit 1
fi
if [ "$ITYPE" = "stable" ]; then if [ "$ITYPE" = "stable" ]; then
repo_rev="$STABLE_REV" repo_rev="$STABLE_REV"
else else
@ -4827,7 +4851,6 @@ install_centos_git_deps() {
# Set ONEDIR_REV to STABLE_REV in case we # Set ONEDIR_REV to STABLE_REV in case we
# end up calling install_centos_onedir_deps # end up calling install_centos_onedir_deps
ONEDIR_REV=${STABLE_REV} ONEDIR_REV=${STABLE_REV}
install_centos_stable_deps || \
install_centos_onedir_deps || \ install_centos_onedir_deps || \
return 1 return 1
@ -7698,13 +7721,8 @@ __set_suse_pkg_repo() {
DISTRO_REPO="SLE_${DISTRO_MAJOR_VERSION}_SP${SUSE_PATCHLEVEL}" DISTRO_REPO="SLE_${DISTRO_MAJOR_VERSION}_SP${SUSE_PATCHLEVEL}"
fi fi
if [ "$_DOWNSTREAM_PKG_REPO" -eq $BS_TRUE ]; then suse_pkg_url_base="https://download.opensuse.org/repositories/systemsmanagement:/saltstack"
suse_pkg_url_base="https://download.opensuse.org/repositories/systemsmanagement:/saltstack" suse_pkg_url_path="${DISTRO_REPO}/systemsmanagement:saltstack.repo"
suse_pkg_url_path="${DISTRO_REPO}/systemsmanagement:saltstack.repo"
else
suse_pkg_url_base="${HTTP_VAL}://repo.saltproject.io/opensuse"
suse_pkg_url_path="${DISTRO_REPO}/systemsmanagement:saltstack:products.repo"
fi
SUSE_PKG_URL="$suse_pkg_url_base/$suse_pkg_url_path" SUSE_PKG_URL="$suse_pkg_url_base/$suse_pkg_url_path"
} }
@ -7724,7 +7742,7 @@ __version_lte() {
zypper --non-interactive install --auto-agree-with-licenses python || return 1 zypper --non-interactive install --auto-agree-with-licenses python || return 1
fi fi
if [ "$(python -c 'import sys; V1=tuple([int(i) for i in sys.argv[1].split(".")]); V2=tuple([int(i) for i in sys.argv[2].split(".")]); print V1<=V2' "$1" "$2")" = "True" ]; then if [ "$(${_PY_EXE} -c 'import sys; V1=tuple([int(i) for i in sys.argv[1].split(".")]); V2=tuple([int(i) for i in sys.argv[2].split(".")]); print(V1<=V2)' "$1" "$2")" = "True" ]; then
__ZYPPER_REQUIRES_REPLACE_FILES=${BS_TRUE} __ZYPPER_REQUIRES_REPLACE_FILES=${BS_TRUE}
else else
__ZYPPER_REQUIRES_REPLACE_FILES=${BS_FALSE} __ZYPPER_REQUIRES_REPLACE_FILES=${BS_FALSE}
@ -8130,6 +8148,11 @@ install_opensuse_15_git() {
return 0 return 0
} }
install_opensuse_15_onedir_deps() {
__opensuse_prep_install || return 1
return 0
}
# #
# End of openSUSE Leap 15 # End of openSUSE Leap 15
# #
@ -8159,6 +8182,13 @@ install_suse_15_git_deps() {
return 0 return 0
} }
install_suse_15_onedir_deps() {
__opensuse_prep_install || return 1
install_opensuse_15_onedir_deps || return 1
return 0
}
install_suse_15_stable() { install_suse_15_stable() {
install_opensuse_stable || return 1 install_opensuse_stable || return 1
return 0 return 0
@ -8169,6 +8199,11 @@ install_suse_15_git() {
return 0 return 0
} }
install_suse_15_onedir() {
install_opensuse_stable || return 1
return 0
}
install_suse_15_stable_post() { install_suse_15_stable_post() {
install_opensuse_stable_post || return 1 install_opensuse_stable_post || return 1
return 0 return 0
@ -8179,6 +8214,11 @@ install_suse_15_git_post() {
return 0 return 0
} }
install_suse_15_onedir_post() {
install_opensuse_stable_post || return 1
return 0
}
install_suse_15_restart_daemons() { install_suse_15_restart_daemons() {
install_opensuse_restart_daemons || return 1 install_opensuse_restart_daemons || return 1
return 0 return 0
@ -8261,6 +8301,11 @@ install_suse_12_git_deps() {
return 0 return 0
} }
install_suse_12_onedir_deps() {
install_suse_12_stable_deps || return 1
return 0
}
install_suse_12_stable() { install_suse_12_stable() {
install_opensuse_stable || return 1 install_opensuse_stable || return 1
return 0 return 0
@ -8271,6 +8316,11 @@ install_suse_12_git() {
return 0 return 0
} }
install_suse_12_onedir() {
install_opensuse_stable || return 1
return 0
}
install_suse_12_stable_post() { install_suse_12_stable_post() {
install_opensuse_stable_post || return 1 install_opensuse_stable_post || return 1
return 0 return 0
@ -8281,6 +8331,11 @@ install_suse_12_git_post() {
return 0 return 0
} }
install_suse_12_onedir_post() {
install_opensuse_stable_post || return 1
return 0
}
install_suse_12_restart_daemons() { install_suse_12_restart_daemons() {
install_opensuse_restart_daemons || return 1 install_opensuse_restart_daemons || return 1
return 0 return 0
@ -8357,6 +8412,11 @@ install_suse_11_git_deps() {
return 0 return 0
} }
install_suse_11_onedir_deps() {
install_suse_11_stable_deps || return 1
return 0
}
install_suse_11_stable() { install_suse_11_stable() {
install_opensuse_stable || return 1 install_opensuse_stable || return 1
return 0 return 0
@ -8367,6 +8427,11 @@ install_suse_11_git() {
return 0 return 0
} }
install_suse_11_onedir() {
install_opensuse_stable || return 1
return 0
}
install_suse_11_stable_post() { install_suse_11_stable_post() {
install_opensuse_stable_post || return 1 install_opensuse_stable_post || return 1
return 0 return 0
@ -8377,6 +8442,11 @@ install_suse_11_git_post() {
return 0 return 0
} }
install_suse_11_onedir_post() {
install_opensuse_stable_post || return 1
return 0
}
install_suse_11_restart_daemons() { install_suse_11_restart_daemons() {
install_opensuse_restart_daemons || return 1 install_opensuse_restart_daemons || return 1
return 0 return 0

13
kitchen.macos.yml
View file

@ -18,22 +18,29 @@ platforms:
- name: macos-1015 - name: macos-1015
suites: suites:
- name: stable-3003 - name: old-stable-3003
provisioner: provisioner:
salt_bootstrap_options: -MP old-stable %s
salt_version: 3003.4 salt_version: 3003.4
salt_call_command: /opt/salt/bin/salt-call salt_call_command: /opt/salt/bin/salt-call
- name: stable-3004 - name: old-stable-3004
provisioner: provisioner:
salt_bootstrap_options: -MP old-stable %s
salt_version: 3004.1 salt_version: 3004.1
salt_call_command: /opt/salt/bin/salt-call salt_call_command: /opt/salt/bin/salt-call
- name: stable-3005 - name: old-stable-3005
provisioner: provisioner:
salt_bootstrap_options: -MP old-stable %s
salt_version: 3005.1 salt_version: 3005.1
salt_call_command: /opt/salt/bin/salt-call salt_call_command: /opt/salt/bin/salt-call
- name: stable-3006 - name: stable-3006
provisioner: provisioner:
salt_version: 3006 salt_version: 3006
salt_call_command: /opt/salt/salt-call salt_call_command: /opt/salt/salt-call
- name: stable-3006-1
provisioner:
salt_version: 3006.1
salt_call_command: /opt/salt/salt-call
- name: latest - name: latest
provisioner: provisioner:
salt_version: latest salt_version: latest

7
kitchen.windows.yml
View file

@ -28,10 +28,17 @@ suites:
- name: stable-3005 - name: stable-3005
provisioner: provisioner:
salt_version: 3005.1-1 salt_version: 3005.1-1
- name: stable-3005-1
provisioner:
salt_version: 3005.1-1
- name: stable-3006 - name: stable-3006
provisioner: provisioner:
salt_version: 3006.0 salt_version: 3006.0
salt_call_command: c:\Program Files\Salt Project\Salt\salt-call.exe salt_call_command: c:\Program Files\Salt Project\Salt\salt-call.exe
- name: stable-3006-1
provisioner:
salt_version: 3006.1
salt_call_command: c:\Program Files\Salt Project\Salt\salt-call.exe
- name: latest - name: latest
provisioner: provisioner:
salt_version: latest salt_version: latest

49
kitchen.yml
View file

@ -224,10 +224,10 @@ suites:
- freebsd-131 - freebsd-131
- freebsd-123 - freebsd-123
- openbsd-6 - openbsd-6
- name: stable-3003-0 - name: old-stable-3003-0
provisioner: provisioner:
salt_version: 3003 salt_version: 3003
salt_bootstrap_options: -x python3 -MP stable 3003.0 salt_bootstrap_options: -x python3 -MP old-stable 3003.0
excludes: excludes:
- opensuse-15 - opensuse-15
- opensuse-tumbleweed - opensuse-tumbleweed
@ -244,10 +244,10 @@ suites:
- freebsd-131 - freebsd-131
- freebsd-123 - freebsd-123
- openbsd-6 - openbsd-6
- name: stable-3003 - name: old-stable-3003
provisioner: provisioner:
salt_version: 3003 salt_version: 3003
salt_bootstrap_options: -x python3 -MP stable %s salt_bootstrap_options: -x python3 -MP old-stable %s
excludes: excludes:
- opensuse-15 - opensuse-15
- opensuse-tumbleweed - opensuse-tumbleweed
@ -255,10 +255,10 @@ suites:
- freebsd-131 - freebsd-131
- freebsd-123 - freebsd-123
- openbsd-6 - openbsd-6
- name: stable-3004-0 - name: old-stable-3004-0
provisioner: provisioner:
salt_version: 3004 salt_version: 3004
salt_bootstrap_options: -x python3 -MP stable 3004.0 salt_bootstrap_options: -x python3 -MP old-stable 3004.0
excludes: excludes:
- opensuse-15 - opensuse-15
- opensuse-tumbleweed - opensuse-tumbleweed
@ -268,10 +268,21 @@ suites:
- freebsd-131 - freebsd-131
- freebsd-123 - freebsd-123
- openbsd-6 - openbsd-6
- name: stable-3004 - name: old-stable-3004
provisioner: provisioner:
salt_version: 3004 salt_version: 3004
salt_bootstrap_options: -x python3 -MP stable %s 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: excludes:
- opensuse-15 - opensuse-15
- opensuse-tumbleweed - opensuse-tumbleweed
@ -290,6 +301,17 @@ suites:
- freebsd-131 - freebsd-131
- freebsd-123 - freebsd-123
- openbsd-6 - openbsd-6
- name: stable-3005-1
provisioner:
salt_version: 3005.1
salt_bootstrap_options: -x python3 -MP stable %s
excludes:
- opensuse-15
- opensuse-tumbleweed
- arch
- freebsd-131
- freebsd-123
- openbsd-6
- name: stable-3006 - name: stable-3006
provisioner: provisioner:
salt_version: 3006 salt_version: 3006
@ -301,6 +323,17 @@ suites:
- freebsd-131 - freebsd-131
- freebsd-123 - freebsd-123
- openbsd-6 - 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: git-master - name: git-master
provisioner: provisioner:
salt_version: master salt_version: master

14
tests/conftest.py
View file

@ -47,7 +47,19 @@ def target_python_version():
@pytest.fixture(scope="session") @pytest.fixture(scope="session")
def target_salt_version(): def target_salt_version():
target_salt = os.environ["KITCHEN_SUITE"].split("-", 2)[-1].replace("-", ".") bootstrap_types = ("git", "stable", "old", "stable", "onedir", "onedir_rc")
# filter out any bootstrap types and then join
target_salt = ".".join(
[
item
for item in os.environ["KITCHEN_SUITE"].split("-")
if item not in bootstrap_types
]
)
# target_salt = os.environ["KITCHEN_SUITE"].split("-", 1)[-1].replace("-", ".")
if target_salt.startswith("v"): if target_salt.startswith("v"):
target_salt = target_salt[1:] target_salt = target_salt[1:]
if target_salt in ("default", "latest", "master", "nightly"): if target_salt in ("default", "latest", "master", "nightly"):