mirror of
https://github.com/saltstack/salt-bootstrap.git
synced 2025-04-16 01:30:21 +00:00
Merge develop into stable for v2022.10.04 release
This commit is contained in:
github-actions[bot] on behalf of @s0undt3ch
commit
74153c5e7f
3 changed files with 35 additions and 7 deletions
17
CHANGELOG.md
17
CHANGELOG.md
|
|
@ -1,3 +1,20 @@
|
|||
# v2022.10.04
|
||||
|
||||
## What's Changed
|
||||
|
||||
- Update README for Windows installation by @eozer in https://github.com/saltstack/salt-bootstrap/pull/1860
|
||||
- Update the bootstrap script to work with final onedir releases. by @garethgreenaway in https://github.com/saltstack/salt-bootstrap/pull/1863
|
||||
- Install Oracle's EPEL repo on Oracle Linux 7 and 8. by @pjcreath in https://github.com/saltstack/salt-bootstrap/pull/1839
|
||||
- onedir install - correct version regex by @jeff350 in https://github.com/saltstack/salt-bootstrap/pull/1868
|
||||
- Ensure the REPO_ARCH for Arm64 is correct. by @garethgreenaway in https://github.com/saltstack/salt-bootstrap/pull/1867
|
||||
|
||||
## New Contributors
|
||||
|
||||
- @eozer made their first contribution in https://github.com/saltstack/salt-bootstrap/pull/1860
|
||||
- @jeff350 made their first contribution in https://github.com/saltstack/salt-bootstrap/pull/1868
|
||||
|
||||
**Full Changelog**: https://github.com/saltstack/salt-bootstrap/compare/v2022.08.13...v2022.10.04
|
||||
|
||||
# v2022.08.13
|
||||
|
||||
## What's Changed
|
||||
|
|
|
|||
|
|
@ -32,6 +32,7 @@ sum** of the downloaded ``bootstrap-salt.sh`` file.
|
|||
|
||||
The SHA256 sum of the ``bootstrap-salt.sh`` file, per release, is:
|
||||
|
||||
- 2022.08.13: ``af922699c1a2bb3b89b6dac04397389999df1b3416b8d0b5c93766412f14c95c``
|
||||
- 2022.08.12: ``b46f018bbf02f45c6096ab96e9261a9adb3a78ff65092c3976f32ffde909afcb``
|
||||
- 2022.05.19: ``e92e1df6930285cf23eda188bee3cfa3dd6c577b4fb7aa91b29213ad820199b1``
|
||||
- 2022.03.15: ``8f65952c3435f441e7f793941d5162d3ec2033a9ef82722ff1da67a2ef860a2f``
|
||||
|
|
@ -395,6 +396,7 @@ Using ``PowerShell`` to install latest stable version:
|
|||
|
||||
.. code:: console
|
||||
|
||||
New-Item -ItemType Directory -Force -Path C:\Temp
|
||||
Invoke-WebRequest -Uri https://winbootstrap.saltproject.io -OutFile C:\Temp\bootstrap-salt.ps1
|
||||
Set-ExecutionPolicy -ExecutionPolicy Unrestricted -Scope CurrentUser
|
||||
C:\Temp\bootstrap-salt.ps1
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
#======================================================================================================================
|
||||
set -o nounset # Treat unset variables as an error
|
||||
|
||||
__ScriptVersion="2022.08.13"
|
||||
__ScriptVersion="2022.10.04"
|
||||
__ScriptName="bootstrap-salt.sh"
|
||||
|
||||
__ScriptFullName="$0"
|
||||
|
|
@ -635,10 +635,10 @@ elif [ "$ITYPE" = "onedir" ]; then
|
|||
if [ "$#" -eq 0 ];then
|
||||
ONEDIR_REV="latest"
|
||||
else
|
||||
if [ "$(echo "$1" | grep -E '^(latest)$')" != "" ]; then
|
||||
if [ "$(echo "$1" | grep -E '^(latest|3005)$')" != "" ]; then
|
||||
ONEDIR_REV="$1"
|
||||
shift
|
||||
elif [ "$(echo "$1" | grep -E '^([3-9][0-9]{3}(\.[0-9]*)?)$')" != "" ]; then
|
||||
elif [ "$(echo "$1" | grep -E '^([3-9][0-9]{3}(\.[0-9]*)?)')" != "" ]; then
|
||||
# Handle the 3xxx.0 version as 3xxx archive (pin to minor) and strip the fake ".0" suffix
|
||||
ONEDIR_REV=$(echo "$1" | sed -E 's/^([3-9][0-9]{3})\.0$/\1/')
|
||||
ONEDIR_REV="minor/$ONEDIR_REV"
|
||||
|
|
@ -668,7 +668,7 @@ elif [ "$ITYPE" = "onedir_rc" ]; then
|
|||
ONEDIR_REV="minor/$1"
|
||||
shift
|
||||
else
|
||||
echo "Unknown stable version: $1 (valid: 3005, latest.)"
|
||||
echo "Unknown stable version: $1 (valid: 3005-1, latest.)"
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
|
@ -1438,8 +1438,8 @@ __check_dpkg_architecture() {
|
|||
warn_msg="Support for arm64 is experimental, make sure the custom repository used has the expected structure and contents."
|
||||
else
|
||||
# Saltstack official repository does not yet have arm64 metadata,
|
||||
# use amd64 repositories on arm64, since all pkgs are arch-independent
|
||||
__REPO_ARCH="amd64"
|
||||
# use arm64 repositories on arm64, since all pkgs are arch-independent
|
||||
__REPO_ARCH="arm64"
|
||||
__REPO_ARCH_DEB="deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=$__REPO_ARCH]"
|
||||
warn_msg="Support for arm64 packages is experimental and might rely on architecture-independent packages from the amd64 repository."
|
||||
fi
|
||||
|
|
@ -4490,7 +4490,7 @@ enabled=1
|
|||
enabled_metadata=1
|
||||
_eof
|
||||
|
||||
fetch_url="${HTTP_VAL}://${_REPO_URL}/${_ONEDIR_DIR}/${__PY_VERSION_REPO}/redhat/${DISTRO_MAJOR_VERSION}/${CPU_ARCH_L}/"
|
||||
fetch_url="${HTTP_VAL}://${_REPO_URL}/${_ONEDIR_DIR}/${__PY_VERSION_REPO}/redhat/${DISTRO_MAJOR_VERSION}/${CPU_ARCH_L}/${ONEDIR_REV}/"
|
||||
for key in $gpg_key; do
|
||||
__rpm_import_gpg "${fetch_url}${key}" || return 1
|
||||
done
|
||||
|
|
@ -5286,6 +5286,15 @@ install_red_hat_enterprise_workstation_testing_post() {
|
|||
# Oracle Linux Install Functions
|
||||
#
|
||||
install_oracle_linux_stable_deps() {
|
||||
# Install Oracle's EPEL.
|
||||
if [ ${_EPEL_REPOS_INSTALLED} -eq $BS_FALSE ]; then
|
||||
_EPEL_REPO=oracle-epel-release-el${DISTRO_MAJOR_VERSION}
|
||||
if ! rpm -q "${_EPEL_REPO}" > /dev/null; then
|
||||
__yum_install_noinput "${_EPEL_REPO}"
|
||||
fi
|
||||
_EPEL_REPOS_INSTALLED=$BS_TRUE
|
||||
fi
|
||||
|
||||
install_centos_stable_deps || return 1
|
||||
return 0
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue