Skip to content

Commit 038f0c2

Browse files
committed
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 <[email protected]>
1 parent 5e39445 commit 038f0c2

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

fluent-package/convert-artifacts-layout.sh

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,13 @@ case $1 in
100100
for arch in aarch64 x86_64; do
101101
# e.g. mapping amazon/2/x86_64/Packages/ => 5/amazon/2/x86_64
102102
mkdir -p $ARTIFACTS_DIR/5/$dist_dest/$release/$arch
103-
find $REPOSITORY_PATH/$dist/$release/$arch -name '*.rpm' -not -name '*debug*' -exec cp {} $ARTIFACTS_DIR/5/$dist_dest/$release/$arch \;
103+
if [ "$2" = "lts" ]; then
104+
find $REPOSITORY_PATH/$dist/$release/$arch -name '*.rpm' \
105+
-not \( -name 'fluent-release*' -o -name '*debug*' \) -exec cp {} $ARTIFACTS_DIR/5/$dist_dest/$release/$arch \;
106+
else
107+
find $REPOSITORY_PATH/$dist/$release/$arch -name '*.rpm' \
108+
-not \( -name 'fluent-lts-release*' -o -name '*debug*' \) -exec cp {} $ARTIFACTS_DIR/5/$dist_dest/$release/$arch \;
109+
fi
104110
done
105111
done
106112
done

0 commit comments

Comments
 (0)