Skip to content

Support lts/v5 again #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kenhys merged 3 commits into from
Oct 9, 2025
Merged

Support lts/v5 again #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c4316ef
Support lts/v5 again
kenhys Oct 8, 2025
f66a47d
Add more usages
kenhys Oct 9, 2025
970babe
Add missing focal for v5
kenhys Oct 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 20 additions & 2 deletions test-install-in-docker.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ case $ID in
export DEBIAN_FRONTEND=noninteractive
CODENAME=$(cat /etc/os-release | grep VERSION_CODENAME | cut -d'=' -f2)
case $CODENAME in
bookworm|trixie|jammy|noble)
bullseye|bookworm|trixie|focal|jammy|noble)
setup_apt_user
export DEBIAN_FRONTEND=noninteractive
echo -e 'Dpkg::Options {\n"--force-confnew";\n}' | tee /etc/apt/apt.conf.d/90force-confnew
Expand All @@ -83,6 +83,9 @@ case $ID in
6)
cat /host/sh/install-$ID-$CODENAME-fluent-package6.sh | sh
;;
lts/5)
cat /host/sh/install-$ID-$CODENAME-fluent-package5-lts.sh | sh
;;
lts/6)
cat /host/sh/install-$ID-$CODENAME-fluent-package6-lts.sh | sh
;;
Expand Down Expand Up @@ -138,6 +141,9 @@ case $ID in
6)
cat /host/sh/install-redhat-fluent-package6.sh | sh
;;
lts/5)
cat /host/sh/install-redhat-fluent-package5-lts.sh | sh
;;
lts/6)
cat /host/sh/install-redhat-fluent-package6-lts.sh | sh
;;
Expand Down Expand Up @@ -182,13 +188,17 @@ case $ID in
;;
*amzn*)
VERSION_ID=$(cat /etc/os-release | grep VERSION_ID | cut -d'=' -f2)
case $VERSION_ID in
DNF=yum
case $VERSION_ID in
*2023*)
setup_dnf_user
case $REPO in
6)
cat /host/sh/install-amazon2023-fluent-package6.sh | sh
;;
lts/5)
cat /host/sh/install-amazon2023-fluent-package5-lts.sh | sh
;;
lts/6)
cat /host/sh/install-amazon2023-fluent-package6-lts.sh | sh
;;
Expand Down Expand Up @@ -228,6 +238,14 @@ case $ID in
;;
esac
;;
*2*)
setup_dnf_user
case $REPO in
lts/5)
cat /host/sh/install-amazon2-fluent-package5-lts.sh | sh
;;
esac
;;
esac
$DNF update -y
v=$($DNF info fluent-package | grep "^Version" | head -n 1 | cut -d':' -f 2)
Expand Down
47 changes: 40 additions & 7 deletions test-verify-repo.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,27 @@
# Usage: test-verify-repo.sh 6.0.0
#
# It try to verify whether fluent-package is installable or not
# from test/experimental/6, test/experimental/lts/6
# from test/experimental/6, test/experimental/lts/6 and so on.
#
# You can customize test targets via environment variables.
#
# REPO_TARGETS: It specify the target repositories (e.g. lts/5, lts/6, exp/6, exp/lts/6)
# DEB_TARGETS: It specify the target debian releases (e.g. debian:trixie, ubuntu:noble)
# If you want to skip it, set DEB_TARGETS=dummy
# RPM_TARGETS: It specify the target RHEL compatible releases (e.g. almalinux:8)
# If you want to skip it, set RPM_TARGETS=dummy
#
# Case 1: test recent v5/LTS
#
# REPO_TARGETS=lts/5 ./test-verify-repo.sh 5.0.8
#
# Case 2: test recent v6/LTS (only deb) on test/experimental/lts/6
#
# REPO_TARGETS=exp/lts/6 RPM_TARGETS=dummy ./test-verify-repo.sh 6.0.0
#
# Case 3: test recent v6/LTS (only rpm) on test/experimental/lts/6
#
# REPO_TARGETS=exp/lts/6 DEB_TARGETS=dummy ./test-verify-repo.sh 6.0.0
#

function test_deb() {
Expand Down Expand Up @@ -50,16 +70,29 @@ fi

VERSION=$1

if [ -z "$REPO_TARGETS" ]; then
REPO_TARGETS="exp/6 exp/lts/6"
fi
if [ -z "$DEB_TARGETS" ]; then
DEB_TARGETS="debian:bookworm debian:trixie ubuntu:jammy ubuntu:noble"
case $REPO_TARGETS in
*6*)
DEB_TARGETS="debian:bookworm debian:trixie ubuntu:jammy ubuntu:noble"
;;
*5*)
DEB_TARGETS="debian:bullseye debian:bookworm ubuntu:focal ubuntu:jammy ubuntu:noble"
;;
esac
fi
if [ -z "$RPM_TARGETS" ]; then
RPM_TARGETS="rockylinux:8 almalinux:9 almalinux:10 amazonlinux:2023"
case $REPO_TARGETS in
*6*)
RPM_TARGETS="rockylinux:8 almalinux:9 almalinux:10 amazonlinux:2023"
;;
*5*)
RPM_TARGETS="rockylinux:8 almalinux:9 amazonlinux:2 amazonlinux:2023"
;;
esac
fi
if [ -z "$REPO_TARGETS" ]; then
REPO_TARGETS="exp/6 exp/lts/6"
fi

echo "DEB_TARGETS: $DEB_TARGETS"
echo "RPM_TARGETS: $RPM_TARGETS"
echo "REPO_TARGETS: $REPO_TARGETS"
Expand Down