packaging: fix base_url for suse repository

Author: illescad

install.sh

@@ -148,27 +148,23 @@ apt-get -y update
 $INSTALL_CMD_PREFIX apt-get -y $APT_PARAMETERS install $INSTALL_PACKAGE_NAME$APT_VERSION
 SCRIPT
     ;;
-    opensuse*|sles)
-        SUSE_OS="opensuse"
-        case "${OS}" in
-          sles|suse) SUSE_OS="sles" ;;
-        esac
-        SUSE_VER="${VERSION_ID:-}"
-
+    opensuse-leap|sles)
         $SUDO sh <<SCRIPT
 rpm --import $RELEASE_KEY
 cat << EOF > /etc/zypp/repos.d/fluent-bit.repo
 [fluent-bit]
 name = Fluent Bit
-baseurl = $RELEASE_URL/$SUSE_OS/$SUSE_VER
+baseurl = $RELEASE_URL/suse/\$releasever
 gpgcheck=1
 repo_gpgcheck=1
 gpgkey=$RELEASE_KEY
 enabled=1
+type=rpm-md
+autorefresh=1
 EOF
 cat /etc/zypp/repos.d/fluent-bit.repo
-zypper --non-interactive refresh
-$INSTALL_CMD_PREFIX zypper --non-interactive $ZYPPER_PARAMETERS install $INSTALL_PACKAGE_NAME$ZYPPER_VERSION
+zypper --non-interactive --gpg-auto-import-keys refresh
+$INSTALL_CMD_PREFIX zypper --non-interactive --gpg-auto-import-keys $ZYPPER_PARAMETERS install $INSTALL_PACKAGE_NAME$ZYPPER_VERSION
 SCRIPT
     ;;
     *)

packaging/README.md

@@ -39,8 +39,8 @@ The [`distros`](./distros/) directory contains OCI container definitions used to
 | Debian        |   10                      | arm64v8 | debian/buster.arm64v8    |
 | openSUSE      |   15.6                    | x86_64  | opensuse/15.6            |
 | openSUSE      |   15.6                    | arm64v8 | opensuse/15.6.arm64v8    |
-| **SLES**      |   15.7                    | x86_64  | sles/15.7                |
-| **SLES**      |   15.7                    | arm64v8 | sles/15.7.arm64v8        |
+| SLES          |   15.7                    | x86_64  | sles/15.7                |
+| SLES          |   15.7                    | arm64v8 | sles/15.7.arm64v8        |
 | Ubuntu        |   24.04 / Noble Numbat    | x86_64  | ubuntu/24.04             |
 | Ubuntu        |   24.04 / Noble Numbat    | arm64v8 | ubuntu/24.04.arm64v8     |
 | Ubuntu        |   22.04 / Jammy Jellyfish | x86_64  | ubuntu/22.04             |

packaging/test-release-packages.sh

@@ -136,7 +136,9 @@ do
         -e FLUENT_BIT_INSTALL_ZYPPER_PARAMETERS="${FLUENT_BIT_INSTALL_ZYPPER_PARAMETERS:-}" \
         $EXTRA_MOUNTS \
         "$IMAGE" \
-        sh -c "zypper --non-interactive refresh && zypper --non-interactive install gpg curl; $INSTALL_CMD && /opt/fluent-bit/bin/fluent-bit --version" | tee "$LOG_FILE"
+        sh -c "zypper --non-interactive --gpg-auto-import-keys refresh \
+               zypper --non-interactive --gpg-auto-import-keys install gpg curl; \
+               $INSTALL_CMD /opt/fluent-bit/bin/fluent-bit --version" | tee "$LOG_FILE"
     check_version "$LOG_FILE"
     rm -f "$LOG_FILE"
 done