fix: update to new repos

Author: JacobCoffee

dockerfiles/Dockerfile.jammy

@@ -48,8 +48,8 @@ RUN /usr/sbin/sshd
 
 # Setup Salt Common
 RUN mkdir -p /etc/apt/keyrings
-RUN wget --quiet -O /etc/apt/keyrings/salt-archive-keyring-2023.pgp https://packages.broadcom.com/artifactory/api/security/keypair/SaltProjectKey/public
-RUN echo "deb [signed-by=/etc/apt/keyrings/salt-archive-keyring-2023.pgp arch=$(dpkg --print-architecture)] https://packages.broadcom.com/artifactory/saltproject-deb/ stable main" > /etc/apt/sources.list.d/salt.list
+RUN wget --quiet -O /etc/apt/keyrings/salt-archive-keyring-2024.pgp https://packages.broadcom.com/artifactory/api/security/keypair/SaltProjectKey/public
+RUN echo "deb [signed-by=/etc/apt/keyrings/salt-archive-keyring-2024.pgp arch=$(dpkg --print-architecture)] https://packages.broadcom.com/artifactory/saltproject-deb/ stable main" > /etc/apt/sources.list.d/salt.list
 
 # Pin to Salt 3006 LTS
 RUN echo -e "Package: salt-*\nPin: version 3006.*\nPin-Priority: 1001" > /etc/apt/preferences.d/salt-pin-1001

dockerfiles/Dockerfile.noble

@@ -48,8 +48,8 @@ RUN /usr/sbin/sshd
 
 # Setup Salt Common
 RUN mkdir -p /etc/apt/keyrings
-RUN wget --quiet -O /etc/apt/keyrings/salt-archive-keyring-2023.pgp https://packages.broadcom.com/artifactory/api/security/keypair/SaltProjectKey/public
-RUN echo "deb [signed-by=/etc/apt/keyrings/salt-archive-keyring-2023.pgp arch=$(dpkg --print-architecture)] https://packages.broadcom.com/artifactory/saltproject-deb/ stable main" > /etc/apt/sources.list.d/salt.list
+RUN wget --quiet -O /etc/apt/keyrings/salt-archive-keyring-2024.pgp https://packages.broadcom.com/artifactory/api/security/keypair/SaltProjectKey/public
+RUN echo "deb [signed-by=/etc/apt/keyrings/salt-archive-keyring-2024.pgp arch=$(dpkg --print-architecture)] https://packages.broadcom.com/artifactory/saltproject-deb/ stable main" > /etc/apt/sources.list.d/salt.list
 
 # Pin to Salt 3006 LTS
 RUN echo -e "Package: salt-*\nPin: version 3006.*\nPin-Priority: 1001" > /etc/apt/preferences.d/salt-pin-1001

docs/guides/migration-recipe.md

@@ -99,9 +99,9 @@ index 68387c9..7a8ace1 100644
     CODENAME=$(cat /etc/os-release | grep VERSION_CODENAME | cut -d '=' -f 2)
    
     echo "Adding the SaltStack repository key for $UBUNTU_VERSION $CODENAME ($ARCH)..."
-    sudo curl -fsSL -o /etc/apt/keyrings/salt-archive-keyring-2023.gpg https://repo.saltproject.io/salt/py3/ubuntu/$UBUNTU_VERSION/$ARCH/SALT-PROJECT-GPG-PUBKEY-2023.gpg
+    sudo curl -fsSL -o /etc/apt/keyrings/salt-archive-keyring-2024.gpg ttps://packages.broadcom.com/artifactory/api/security/keypair/SaltProjectKey/public
     echo "Adding the SaltStack repository for $UBUNTU_VERSION $CODENAME ($ARCH)..."
-    echo "deb [signed-by=/etc/apt/keyrings/salt-archive-keyring-2023.gpg arch=$ARCH] https://repo.saltproject.io/salt/py3/ubuntu/$UBUNTU_VERSION/$ARCH/latest $CODENAME main" | sudo tee /etc/apt/sources.list.d/salt.list
+    echo "deb [signed-by=/etc/apt/keyrings/salt-archive-keyring-2024.gpg arch=$ARCH] https://packages.broadcom.com/artifactory/saltproject-deb/ stable main" | sudo tee /etc/apt/sources.list.d/salt.list
     ```
 3. Install and configure the salt-minion. On `$new-host`, run the command
     ```console

salt/base/salt.sls

@@ -37,7 +37,7 @@ salt-repo:
   pkgrepo.managed:
     {# https://saltproject.io/blog/salt-project-package-repo-migration-and-guidance/ #}
     {% if grains["oscodename"] in ["jammy", "noble"] %}
-    - name: deb [signed-by=/etc/apt/keyrings/salt-archive-keyring-2023.pgp arch={{ grains["osarch"] }}] https://packages.broadcom.com/artifactory/saltproject-deb/ stable main
+    - name: deb [signed-by=/etc/apt/keyrings/salt-archive-keyring-2024.pgp arch={{ grains["osarch"] }}] https://packages.broadcom.com/artifactory/saltproject-deb/ stable main
     - key_url: https://packages.broadcom.com/artifactory/api/security/keypair/SaltProjectKey/public
     - aptkey: False
     - file: /etc/apt/sources.list.d/salt.list