Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update with 3006 stable installs #1906

Merged
merged 21 commits into from
Apr 15, 2023
Merged

Update with 3006 stable installs #1906

Changes from 2 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
baebf62
Adding support for installing 3006 via bootstrap. Updating stable ty…
garethgreenaway Mar 29, 2023
1a7a708
Fix REV variable to be ONEDIR_REV to match ITYPE
garethgreenaway Mar 29, 2023
829094e
account for the older key in latest until latest points to 3006 and i…
garethgreenaway Mar 30, 2023
88319ab
add some dummy install onedir functions to call the stable version fo…
garethgreenaway Mar 30, 2023
40eb43e
on RH based systems, check that the updated GPG key exists otherwise …
garethgreenaway Mar 30, 2023
edd4b6f
Ensure STABLE_REV is still set for a couple functions that still use …
garethgreenaway Mar 30, 2023
4eaf22f
Don't include SALT-PROJECT-GPG-PUBKEY-2023.pub if it's not found.
garethgreenaway Mar 31, 2023
499f895
Adding +install_macosx_onedir and friends
garethgreenaway Mar 31, 2023
07ab709
need a dummy install_fedora_onedir_post that calls install_fedora_sta…
garethgreenaway Mar 31, 2023
67a0df2
need a dummy install_arch_linux_onedir_post that calls install_arch_l…
garethgreenaway Mar 31, 2023
779cfbf
first pass at parsing the repo.json for Mac when using onedir and lat…
garethgreenaway Apr 14, 2023
f976efc
different approach to setting the _ONEDIR_REV from the parse repo.jso…
garethgreenaway Apr 14, 2023
b03a99e
Need _ONEDIR_REV defined in a couple more places.
garethgreenaway Apr 14, 2023
d0032c7
fixing SALTPKGCONFURL, same one for onedir locations just populated w…
garethgreenaway Apr 14, 2023
efbd416
parse json first, since different versions have different naming sche…
garethgreenaway Apr 14, 2023
0f39aca
Fixing Arch by adding additional onedir functions to call stable func…
garethgreenaway Apr 14, 2023
4a74744
Remove end of line from grep for 3005.
garethgreenaway Apr 14, 2023
b57d374
removing python 3.6 related code which is no longer needed.
garethgreenaway Apr 14, 2023
1aa72d9
Need to set STABLE_REV to ONEDIR_REV when install_gentoo_onedir is ca…
garethgreenaway Apr 14, 2023
be030c1
suggested fixes
garethgreenaway Apr 14, 2023
2af0e6c
All Mac packages are now signed.
garethgreenaway Apr 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 15 additions & 6 deletions bootstrap-salt.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -616,20 +616,29 @@ if [ "$ITYPE" = "git" ]; then
# If doing stable install, check if version specified
elif [ "$ITYPE" = "stable" ]; then
if [ "$#" -eq 0 ];then
STABLE_REV="latest"
ONEDIR_REV="latest"
ITYPE="onedir"
else
if [ "$(echo "$1" | grep -E '^(latest|1\.6|1\.7|2014\.1|2014\.7|2015\.5|2015\.8|2016\.3|2016\.11|2017\.7|2018\.3|2019\.2|3000|3001|3002|3003|3004|3005)$')" != "" ]; then
if [ "$(echo "$1" | grep -E '^(nightly|latest|3006)$')" != "" ]; then
ONEDIR_REV="$1"
ITYPE="onedir"
shift
elif [ "$(echo "$1" | grep -E '^(3003|3004|3005)$')" != "" ]; then
STABLE_REV="$1"
shift
elif [ "$(echo "$1" | grep -E '^(2[0-9]*\.[0-9]*\.[0-9]*|[3-9][0-9]{3}(\.[0-9]*)?)$')" != "" ]; then
elif [ "$(echo "$1" | grep -E '^([3-9][6-9]{3}(\.[0-9]*)?)')" != "" ]; then
ONEDIR_REV="minor/$1"
ITYPE="onedir"
shift
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
STABLE_REV=$(echo "$1" | sed -E 's/^([3-9][0-9]{3})\.0$/\1/')
if [ "$(uname)" != "Darwin" ]; then
STABLE_REV="archive/$STABLE_REV"
fi
shift
else
echo "Unknown stable version: $1 (valid: 1.6, 1.7, 2014.1, 2014.7, 2015.5, 2015.8, 2016.3, 2016.11, 2017.7, 2018.3, 2019.2, 3000, 3001, 3002, 3003, 3004, 3005, latest, \$MAJOR.\$MINOR.\$PATCH until 2019.2, \$MAJOR or \$MAJOR.\$PATCH starting from 3000)"
echo "Unknown stable version: $1 (valid: 3003, 3004, 3005, 3006, latest)"
exit 1
fi
fi
Expand All @@ -638,7 +647,7 @@ elif [ "$ITYPE" = "onedir" ]; then
if [ "$#" -eq 0 ];then
ONEDIR_REV="latest"
else
if [ "$(echo "$1" | grep -E '^(nightly|latest|3005)$')" != "" ]; then
if [ "$(echo "$1" | grep -E '^(nightly|latest|3005|3006)$')" != "" ]; then
ONEDIR_REV="$1"
shift
elif [ "$(echo "$1" | grep -E '^(3005(\.[0-9]*)?)')" != "" ]; then
Expand All @@ -650,7 +659,7 @@ elif [ "$ITYPE" = "onedir" ]; then
ONEDIR_REV="minor/$1"
shift
else
echo "Unknown onedir version: $1 (valid: 3005, latest, nightly.)"
echo "Unknown onedir version: $1 (valid: 3005, 3006, latest, nightly.)"
exit 1
fi
fi
Expand Down