Adding test-packages to support zypper and install.sh to support suse

Author: illescad

install.sh

@@ -14,6 +14,7 @@ INSTALL_PACKAGE_NAME=${FLUENT_BIT_INSTALL_PACKAGE_NAME:-fluent-bit}
 # Optional Apt/Yum additional parameters (e.g. releasever for AL2022/AL2023)
 APT_PARAMETERS=${FLUENT_BIT_INSTALL_APT_PARAMETERS:-}
 YUM_PARAMETERS=${FLUENT_BIT_INSTALL_YUM_PARAMETERS:-}
+ZYPPER_PARAMETERS=${FLUENT_BIT_INSTALL_ZYPPER_PARAMETERS:-}
 
 echo "================================"
 echo " Fluent Bit Installation Script "
@@ -48,9 +49,11 @@ fi
 # Set up version pinning
 APT_VERSION=''
 YUM_VERSION=''
+ZYPPER_VERSION=''
 if [ -n "${RELEASE_VERSION}" ]; then
     APT_VERSION="=$RELEASE_VERSION"
     YUM_VERSION="-$RELEASE_VERSION"
+    ZYPPER_VERSION="-$RELEASE_VERSION"
 fi
 
 # Now set up repos and install dependent on OS, version, etc.
@@ -143,6 +146,29 @@ EOF
 cat /etc/apt/sources.list.d/fluent-bit.list
 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:-}"
+
+        $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
+gpgcheck=1
+repo_gpgcheck=1
+gpgkey=$RELEASE_KEY
+enabled=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
 SCRIPT
     ;;
     *)

packaging/README.md

@@ -37,8 +37,8 @@ The [`distros`](./distros/) directory contains OCI container definitions used to
 | Debian        |   11                      | arm64v8 | debian/bullseye.arm64v8  |
 | Debian        |   10                      | x86_64  | debian/buster            |
 | Debian        |   10                      | arm64v8 | debian/buster.arm64v8    |
-| Opensuse      |   15.6                    | x86_64  | opensuse/15.6            |
-| Opensuse      |   15.6                    | arm64v8 | opensuse/15.6.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        |
 | Ubuntu        |   24.04 / Noble Numbat    | x86_64  | ubuntu/24.04             |

packaging/test-release-packages.sh

@@ -58,10 +58,14 @@ YUM_TARGETS=(
     "quay.io/centos/centos:stream10"
     "amazonlinux:2"
     "amazonlinux:2023"
-    "opensuse/15.6"
-    "sles/15.7"
 )
 
+ZYPPER_TARGETS=(
+    "opensuse/leap:15.6"
+    "registry.suse.com/bci/bci-base:15.7"
+)
+   
+
 for IMAGE in "${YUM_TARGETS[@]}"
 do
     echo "Testing $IMAGE"
@@ -115,3 +119,24 @@ do
     check_version "$LOG_FILE"
     rm -f "$LOG_FILE"
 done
+
+# New loop for ZYPPER_TARGETS
+for IMAGE in "${ZYPPER_TARGETS[@]}"
+do
+    echo "Testing $IMAGE"
+    LOG_FILE=$(mktemp)
+    # We do want word splitting for EXTRA_MOUNTS
+    # shellcheck disable=SC2086
+    $CONTAINER_RUNTIME run --rm -t \
+        -e FLUENT_BIT_PACKAGES_URL="${FLUENT_BIT_PACKAGES_URL:-https://packages.fluentbit.io}" \
+        -e FLUENT_BIT_PACKAGES_KEY="${FLUENT_BIT_PACKAGES_KEY:-https://packages.fluentbit.io/fluentbit.key}" \
+        -e FLUENT_BIT_RELEASE_VERSION="${FLUENT_BIT_RELEASE_VERSION:-}" \
+        -e FLUENT_BIT_INSTALL_COMMAND_PREFIX="${FLUENT_BIT_INSTALL_COMMAND_PREFIX:-}" \
+        -e FLUENT_BIT_INSTALL_PACKAGE_NAME="${FLUENT_BIT_INSTALL_PACKAGE_NAME:-fluent-bit}" \
+        -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"
+    check_version "$LOG_FILE"
+    rm -f "$LOG_FILE"
+done