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

Revert to ubuntu 22.04 container, and fix multiple .repo typo

Browse source
This commit is contained in:
David Murphy 2024-11-05 15:42:35 -07:00
parent 67a0bef81d
commit ff6c817bfe
No known key found for this signature in database
GPG key ID: 9D7724F37A7424D8
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -29,7 +29,7 @@ jobs:
## DGM runs-on: ubuntu-20.04
runs-on: ubuntu-latest
container:
image: ghcr.io/saltstack/salt-ci-containers/packaging:rockylinux-9
image: ghcr.io/saltstack/salt-ci-containers/packaging:ubuntu-22.04
timeout-minutes: ${{ inputs.timeout }}
strategy:

12
bootstrap-salt.sh
View file

@ -4068,7 +4068,7 @@ __install_saltstack_fedora_onedir_repository() {
## DGM yum clean metadata || return 1
FETCH_URL="https://github.com/saltstack/salt-install-guide/releases/latest/download/salt.repo"
__fetch_url "${YUM_REPO_FILE}" "${FETCH_URL}.repo"
__fetch_url "${YUM_REPO_FILE}" "${FETCH_URL}"
if [ "$REPO_REV" != "latest" ]; then
# 3006.x is default
REPO_REV_MAJOR=$(echo "$REPO_REV" | cut -d '.' -f 1)
@ -4443,7 +4443,7 @@ __install_saltstack_rhel_onedir_repository() {
if [ ! -s "$YUM_REPO_FILE" ] || [ "$_FORCE_OVERWRITE" -eq $BS_TRUE ]; then
FETCH_URL="https://github.com/saltstack/salt-install-guide/releases/latest/download/salt.repo"
__fetch_url "${YUM_REPO_FILE}" "${FETCH_URL}.repo"
__fetch_url "${YUM_REPO_FILE}" "${FETCH_URL}"
if [ "$REPO_REV" != "latest" ]; then
# 3006.x is default
REPO_REV_MAJOR=$(echo "$REPO_REV" | cut -d '.' -f 1)
@ -6079,7 +6079,7 @@ install_amazon_linux_ami_2_deps() {
YUM_REPO_FILE="/etc/yum.repos.d/salt.repo"
if [ ! -s "${YUM_REPO_FILE}" ]; then
FETCH_URL="https://github.com/saltstack/salt-install-guide/releases/latest/download/salt.repo"
__fetch_url "${YUM_REPO_FILE}" "${FETCH_URL}.repo"
__fetch_url "${YUM_REPO_FILE}" "${FETCH_URL}"
if [ "$REPO_REV" != "latest" ]; then
# 3006.x is default
REPO_REV_MAJOR=$(echo "$REPO_REV" | cut -d '.' -f 1)
@ -6158,7 +6158,7 @@ install_amazon_linux_ami_2_onedir_deps() {
YUM_REPO_FILE="/etc/yum.repos.d/salt.repo"
if [ ! -s "${YUM_REPO_FILE}" ]; then
FETCH_URL="https://github.com/saltstack/salt-install-guide/releases/latest/download/salt.repo"
__fetch_url "${YUM_REPO_FILE}" "${FETCH_URL}.repo"
__fetch_url "${YUM_REPO_FILE}" "${FETCH_URL}"
if [ "$REPO_REV" != "latest" ]; then
# 3006.x is default
REPO_REV_MAJOR=$(echo "$REPO_REV" | cut -d '.' -f 1)
@ -6320,7 +6320,7 @@ install_amazon_linux_ami_2023_onedir_deps() {
YUM_REPO_FILE="/etc/yum.repos.d/salt.repo"
if [ ! -s "${YUM_REPO_FILE}" ]; then
FETCH_URL="https://github.com/saltstack/salt-install-guide/releases/latest/download/salt.repo"
__fetch_url "${YUM_REPO_FILE}" "${FETCH_URL}.repo"
__fetch_url "${YUM_REPO_FILE}" "${FETCH_URL}"
if [ "$REPO_REV" != "latest" ]; then
# 3006.x is default
REPO_REV_MAJOR=$(echo "$REPO_REV" | cut -d '.' -f 1)
@ -6679,7 +6679,7 @@ __install_saltstack_photon_onedir_repository() {
## DGM __rpm_import_gpg "${FETCH_URL}/${GPG_KEY}" || return 1
FETCH_URL="https://github.com/saltstack/salt-install-guide/releases/latest/download/salt.repo"
__fetch_url "${YUM_REPO_FILE}" "${FETCH_URL}.repo"
__fetch_url "${YUM_REPO_FILE}" "${FETCH_URL}"
if [ "$REPO_REV" != "latest" ]; then
# 3006.x is default
REPO_REV_MAJOR=$(echo "$REPO_REV" | cut -d '.' -f 1)