From 038f0c28fdc43891268068c945a0b7cd8a1d19d9 Mon Sep 17 00:00:00 2001 From: Kentaro Hayashi Date: Wed, 27 Aug 2025 11:09:00 +0900 Subject: [PATCH] Backport rpm: support to convert fluent-release package too (#890) Recently fluent-release package was introduced, to convey them correctly from artifacts to our repository layout, need to support it explicitly. Signed-off-by: Kentaro Hayashi --- fluent-package/convert-artifacts-layout.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/fluent-package/convert-artifacts-layout.sh b/fluent-package/convert-artifacts-layout.sh index 28874db6f..b1b414147 100755 --- a/fluent-package/convert-artifacts-layout.sh +++ b/fluent-package/convert-artifacts-layout.sh @@ -100,7 +100,13 @@ case $1 in for arch in aarch64 x86_64; do # e.g. mapping amazon/2/x86_64/Packages/ => 5/amazon/2/x86_64 mkdir -p $ARTIFACTS_DIR/5/$dist_dest/$release/$arch - find $REPOSITORY_PATH/$dist/$release/$arch -name '*.rpm' -not -name '*debug*' -exec cp {} $ARTIFACTS_DIR/5/$dist_dest/$release/$arch \; + if [ "$2" = "lts" ]; then + find $REPOSITORY_PATH/$dist/$release/$arch -name '*.rpm' \ + -not \( -name 'fluent-release*' -o -name '*debug*' \) -exec cp {} $ARTIFACTS_DIR/5/$dist_dest/$release/$arch \; + else + find $REPOSITORY_PATH/$dist/$release/$arch -name '*.rpm' \ + -not \( -name 'fluent-lts-release*' -o -name '*debug*' \) -exec cp {} $ARTIFACTS_DIR/5/$dist_dest/$release/$arch \; + fi done done done