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

Bootstrap fixes for 3006 #1900

Merged
merged 7 commits into from
Mar 10, 2023
Merged

Bootstrap fixes for 3006 #1900

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f786682
fixes for 3006 release.
garethgreenaway Mar 3, 2023
ec256eb
Update repo GPG keys for debian and Ubuntu.
garethgreenaway Mar 3, 2023
6665f2a
Merge branch 'develop' into bootstrap_fixes_3006
garethgreenaway Mar 9, 2023
226ddef
Update regex for determining the GPG key to use.
garethgreenaway Mar 9, 2023
89bcad9
Look for version in ONEDIR_REV. Use older key for nightly builds uni…
garethgreenaway Mar 9, 2023
c9a6be1
fix for amazon2 GPG key logic.
garethgreenaway Mar 9, 2023
89b3057
Adding nightly to the check for the older GPG key until 3006 release.
garethgreenaway Mar 10, 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
Prev Previous commit
Next Next commit
Update regex for determining the GPG key to use.
  • Loading branch information
@garethgreenaway
garethgreenaway committed Mar 9, 2023
commit 226ddef2c4af74ad884d879c3042ffd12253608b
6 changes: 3 additions & 3 deletions bootstrap-salt.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3078,7 +3078,7 @@ __install_saltstack_ubuntu_onedir_repository() {
fi
echo "$__REPO_ARCH_DEB $SALTSTACK_UBUNTU_URL $UBUNTU_CODENAME main" > /etc/apt/sources.list.d/salt.list

if [ "$(echo "${ONEDIR_REV}" | grep -E '^(3004|3005)')" != "" ]; then
if [ "$(echo "${ONEDIR_REV}" | grep -E '(3004|3005)')" != "" ]; then
__apt_key_fetch "${SALTSTACK_UBUNTU_URL}salt-archive-keyring.gpg" || return 1
else
__apt_key_fetch "${SALTSTACK_UBUNTU_URL}SALT-PROJECT-GPG-PUBKEY-2023.gpg" || return 1
Expand Down Expand Up @@ -3622,7 +3622,7 @@ __install_saltstack_debian_onedir_repository() {
fi
echo "$__REPO_ARCH_DEB $SALTSTACK_DEBIAN_URL $DEBIAN_CODENAME main" > "/etc/apt/sources.list.d/salt.list"

if [ "$(echo "${ONEDIR_REV}" | grep -E '^(3004|3005)')" != "" ]; then
if [ "$(echo "${ONEDIR_REV}" | grep -E '(3004|3005)')" != "" ]; then
__apt_key_fetch "${SALTSTACK_DEBIAN_URL}salt-archive-keyring.gpg" || return 1
else
__apt_key_fetch "${SALTSTACK_DEBIAN_URL}SALT-PROJECT-GPG-PUBKEY-2023.gpg" || return 1
Expand Down Expand Up @@ -4510,7 +4510,7 @@ __install_saltstack_rhel_onedir_repository() {
if [ "${ONEDIR_REV}" = "nightly" ] ; then
base_url="${HTTP_VAL}://${_REPO_URL}/${_ONEDIR_NIGHTLY_DIR}/${__PY_VERSION_REPO}/redhat/${DISTRO_MAJOR_VERSION}/\$basearch/"
fi
if [ "$(echo "${repo_rev}" | grep -E '^(3004|3005)')" != "" ]; then
if [ "$(echo "${repo_rev}" | grep -E '(3004|3005)')" != "" ]; then
if [ "${DISTRO_MAJOR_VERSION}" -eq 9 ]; then
gpg_key="SALTSTACK-GPG-KEY2.pub"
else
Expand Down