From ff6c817bfeae4341db0e612333e5edcf4a0b6ce7 Mon Sep 17 00:00:00 2001
From: David Murphy <damurphy@vmware.com>
Date: Tue, 5 Nov 2024 15:42:35 -0700
Subject: [PATCH] Revert to ubuntu 22.04 container, and fix multiple .repo typo

---
 .github/workflows/test-linux.yml |  2 +-
 bootstrap-salt.sh                | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml
index 3cd736f..75c80a8 100644
--- a/.github/workflows/test-linux.yml
+++ b/.github/workflows/test-linux.yml
@@ -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:
diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 37501bb..74de3e2 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -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)