Skip to content

Commit 8a93aa1

Browse files
kenhyskenhys
authored
Follow to release v6 packages (#867)
Signed-off-by: Kentaro Hayashi <[email protected]>
1 parent ccbbede commit 8a93aa1

File tree

4 files changed

+62
-82
lines changed

4 files changed

+62
-82
lines changed

‎fluent-package/convert-artifacts-layout.sh

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -32,40 +32,40 @@ case $1 in
3232
bookworm|trixie)
3333
# e.g. mapping debian/pool/buster/main/t/td-agent/ => 5/debian/buster/pool/contrib/t/td-agent
3434
# mapping debian/pool/buster/main/f/fluent-package/ => 5/debian/buster/pool/contrib/f/fluent-package
35-
mkdir -p $ARTIFACTS_DIR/5/debian/$d/pool/contrib/f/fluent-package
35+
mkdir -p $ARTIFACTS_DIR/6/debian/$d/pool/contrib/f/fluent-package
3636
find $REPOSITORY_PATH/debian/pool/$d -name 'td-agent*.deb' -not -name '*dbgsym*' \
37-
-exec cp {} $ARTIFACTS_DIR/5/debian/$d/pool/contrib/f/fluent-package \;
37+
-exec cp {} $ARTIFACTS_DIR/6/debian/$d/pool/contrib/f/fluent-package \;
3838
find $REPOSITORY_PATH/debian/pool/$d -name 'fluent-package*.deb' -not -name '*dbgsym*' \
39-
-exec cp {} $ARTIFACTS_DIR/5/debian/$d/pool/contrib/f/fluent-package \;
39+
-exec cp {} $ARTIFACTS_DIR/6/debian/$d/pool/contrib/f/fluent-package \;
4040
if [ "$2" = "lts" ]; then
41-
mkdir -p $ARTIFACTS_DIR/5/debian/$d/pool/contrib/f/fluent-lts-apt-source
41+
mkdir -p $ARTIFACTS_DIR/6/debian/$d/pool/contrib/f/fluent-lts-apt-source
4242
find $REPOSITORY_PATH/debian/pool/$d -name 'fluent-lts-apt-source*.deb' -not -name '*dbgsym*' \
43-
-exec cp {} $ARTIFACTS_DIR/5/debian/$d/pool/contrib/f/fluent-lts-apt-source \;
43+
-exec cp {} $ARTIFACTS_DIR/6/debian/$d/pool/contrib/f/fluent-lts-apt-source \;
4444
else
45-
mkdir -p $ARTIFACTS_DIR/5/debian/$d/pool/contrib/f/fluent-apt-source
45+
mkdir -p $ARTIFACTS_DIR/6/debian/$d/pool/contrib/f/fluent-apt-source
4646
find $REPOSITORY_PATH/debian/pool/$d -name 'fluent*-apt-source*.deb' \
4747
-not -name '*dbgsym*' \
4848
-not -name 'fluent-lts*' \
49-
-exec cp {} $ARTIFACTS_DIR/5/debian/$d/pool/contrib/f/fluent-apt-source \;
49+
-exec cp {} $ARTIFACTS_DIR/6/debian/$d/pool/contrib/f/fluent-apt-source \;
5050
fi
5151
;;
5252
jammy|noble)
5353
# e.g. mapping ubuntu/pool/.../main/t/td-agent/ => 5/ubuntu/.../pool/contrib/t/td-agent
5454
# mapping ubuntu/pool/.../main/f/fluent-package/ => 5/ubuntu/.../pool/contrib/f/fluent-package
55-
mkdir -p $ARTIFACTS_DIR/5/ubuntu/$d/pool/contrib/f/fluent-package
55+
mkdir -p $ARTIFACTS_DIR/6/ubuntu/$d/pool/contrib/f/fluent-package
5656
find $REPOSITORY_PATH/ubuntu/pool/$d -name 'td-agent*.deb' \
57-
-exec cp {} $ARTIFACTS_DIR/5/ubuntu/$d/pool/contrib/f/fluent-package \;
57+
-exec cp {} $ARTIFACTS_DIR/6/ubuntu/$d/pool/contrib/f/fluent-package \;
5858
find $REPOSITORY_PATH/ubuntu/pool/$d -name 'fluent-package*.deb' \
59-
-exec cp {} $ARTIFACTS_DIR/5/ubuntu/$d/pool/contrib/f/fluent-package \;
59+
-exec cp {} $ARTIFACTS_DIR/6/ubuntu/$d/pool/contrib/f/fluent-package \;
6060
if [ "$2" = "lts" ]; then
61-
mkdir -p $ARTIFACTS_DIR/5/ubuntu/$d/pool/contrib/f/fluent-lts-apt-source
61+
mkdir -p $ARTIFACTS_DIR/6/ubuntu/$d/pool/contrib/f/fluent-lts-apt-source
6262
find $REPOSITORY_PATH/ubuntu/pool/$d -name 'fluent-lts-apt-source*.deb' \
63-
-exec cp {} $ARTIFACTS_DIR/5/ubuntu/$d/pool/contrib/f/fluent-lts-apt-source \;
63+
-exec cp {} $ARTIFACTS_DIR/6/ubuntu/$d/pool/contrib/f/fluent-lts-apt-source \;
6464
else
65-
mkdir -p $ARTIFACTS_DIR/5/ubuntu/$d/pool/contrib/f/fluent-apt-source
65+
mkdir -p $ARTIFACTS_DIR/6/ubuntu/$d/pool/contrib/f/fluent-apt-source
6666
find $REPOSITORY_PATH/ubuntu/pool/$d -name 'fluent*-apt-source*.deb' \
6767
-not -name 'fluent-lts*' \
68-
-exec cp {} $ARTIFACTS_DIR/5/ubuntu/$d/pool/contrib/f/fluent-apt-source \;
68+
-exec cp {} $ARTIFACTS_DIR/6/ubuntu/$d/pool/contrib/f/fluent-apt-source \;
6969
fi
7070
;;
7171
*)
@@ -101,8 +101,8 @@ case $1 in
101101
fi
102102
for arch in aarch64 x86_64; do
103103
# e.g. mapping amazon/2/x86_64/Packages/ => 5/amazon/2/x86_64
104-
mkdir -p $ARTIFACTS_DIR/5/$dist_dest/$release/$arch
105-
find $REPOSITORY_PATH/$dist/$release/$arch -name '*.rpm' -not -name '*debug*' -exec cp {} $ARTIFACTS_DIR/5/$dist_dest/$release/$arch \;
104+
mkdir -p $ARTIFACTS_DIR/6/$dist_dest/$release/$arch
105+
find $REPOSITORY_PATH/$dist/$release/$arch -name '*.rpm' -not -name '*debug*' -exec cp {} $ARTIFACTS_DIR/6/$dist_dest/$release/$arch \;
106106
done
107107
done
108108
done

‎fluent-package/manage-fluent-repositories.sh

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -74,24 +74,24 @@ case $COMMAND in
7474
$command
7575
;;
7676
dry-upload|upload)
77-
TARGETS="amazon redhat windows macosx debian/bookworm debian/trixie ubuntu/jammy ubuntu/focal ubuntu/noble"
77+
TARGETS="amazon redhat windows debian/bookworm debian/trixie ubuntu/jammy ubuntu/noble"
7878
DRYRUN_OPTION="--dryrun"
7979
if [ $COMMAND = "upload" ]; then
8080
DRYRUN_OPTION=""
8181
fi
8282
for target in $TARGETS; do
8383
case $FLUENT_RELEASE_DIR in
8484
*test/experimental/lts)
85-
command="aws s3 sync $DRYRUN_OPTION --delete $FLUENT_RELEASE_DIR/5/$target s3://packages.treasuredata.com/test/experimental/lts/5/$target --profile $FLUENT_RELEASE_PROFILE"
85+
command="aws s3 sync $DRYRUN_OPTION --delete $FLUENT_RELEASE_DIR/6/$target s3://packages.treasuredata.com/test/experimental/lts/6/$target --profile $FLUENT_RELEASE_PROFILE"
8686
;;
8787
*test/experimental)
88-
command="aws s3 sync $DRYRUN_OPTION --delete $FLUENT_RELEASE_DIR/5/$target s3://packages.treasuredata.com/test/experimental/5/$target --profile $FLUENT_RELEASE_PROFILE"
88+
command="aws s3 sync $DRYRUN_OPTION --delete $FLUENT_RELEASE_DIR/6/$target s3://packages.treasuredata.com/test/experimental/6/$target --profile $FLUENT_RELEASE_PROFILE"
8989
;;
9090
*lts)
91-
command="aws s3 sync $DRYRUN_OPTION --delete $FLUENT_RELEASE_DIR/5/$target s3://packages.treasuredata.com/lts/5/$target --profile $FLUENT_RELEASE_PROFILE"
91+
command="aws s3 sync $DRYRUN_OPTION --delete $FLUENT_RELEASE_DIR/6/$target s3://packages.treasuredata.com/lts/6/$target --profile $FLUENT_RELEASE_PROFILE"
9292
;;
9393
*)
94-
command="aws s3 sync $DRYRUN_OPTION --delete $FLUENT_RELEASE_DIR/5/$target s3://packages.treasuredata.com/5/$target --profile $FLUENT_RELEASE_PROFILE"
94+
command="aws s3 sync $DRYRUN_OPTION --delete $FLUENT_RELEASE_DIR/6/$target s3://packages.treasuredata.com/6/$target --profile $FLUENT_RELEASE_PROFILE"
9595
;;
9696
esac
9797
echo $command
@@ -139,45 +139,45 @@ EOF
139139
sleep 10
140140
export GPG_TTY=$(tty)
141141
for d in bookworm trixie jammy noble; do
142-
aptly -config="$aptly_conf" repo create -distribution=$d -component=contrib fluent-package5-$d
142+
aptly -config="$aptly_conf" repo create -distribution=$d -component=contrib fluent-package6-$d
143143
case $d in
144144
bookworm|trixie)
145-
aptly -config="$aptly_conf" repo add fluent-package5-$d $FLUENT_RELEASE_DIR/5/debian/$d/
146-
aptly -config="$aptly_conf" snapshot create fluent-package5-$d-${FLUENT_PACKAGE_VERSION}-1 from repo fluent-package5-$d
145+
aptly -config="$aptly_conf" repo add fluent-package6-$d $FLUENT_RELEASE_DIR/6/debian/$d/
146+
aptly -config="$aptly_conf" snapshot create fluent-package6-$d-${FLUENT_PACKAGE_VERSION}-1 from repo fluent-package6-$d
147147
# publish snapshot with prefix, InRelease looks like (e.g. bullseye):
148148
# Origin: bullseye bullseye
149149
# Label: bullseye bullseye
150-
aptly -config="$aptly_conf" publish snapshot -component=contrib -gpg-key=$SIGNING_KEY fluent-package5-$d-${FLUENT_PACKAGE_VERSION}-1 $d
150+
aptly -config="$aptly_conf" publish snapshot -component=contrib -gpg-key=$SIGNING_KEY fluent-package6-$d-${FLUENT_PACKAGE_VERSION}-1 $d
151151
# Place generated files, package files themselves are already in there
152-
tar cf - --exclude="td-agent_*.deb" --exclude="fluent-package_*.deb" -C "$aptly_rootdir/public" $d | tar xvf - -C $FLUENT_RELEASE_DIR/5/debian/
152+
tar cf - --exclude="td-agent_*.deb" --exclude="fluent-package_*.deb" -C "$aptly_rootdir/public" $d | tar xvf - -C $FLUENT_RELEASE_DIR/6/debian/
153153
;;
154154
jammy|noble)
155-
aptly -config="$aptly_conf" repo add fluent-package5-$d $FLUENT_RELEASE_DIR/5/ubuntu/$d/
156-
aptly -config="$aptly_conf" snapshot create fluent-package5-$d-${FLUENT_PACKAGE_VERSION}-1 from repo fluent-package5-$d
155+
aptly -config="$aptly_conf" repo add fluent-package6-$d $FLUENT_RELEASE_DIR/6/ubuntu/$d/
156+
aptly -config="$aptly_conf" snapshot create fluent-package6-$d-${FLUENT_PACKAGE_VERSION}-1 from repo fluent-package6-$d
157157
# publish snapshot with prefix, InRelease looks like (e.g. focal):
158158
# Origin: focal focal
159159
# Label: focal focal
160-
aptly -config="$aptly_conf" publish snapshot -component=contrib -gpg-key=$SIGNING_KEY fluent-package5-$d-${FLUENT_PACKAGE_VERSION}-1 $d
160+
aptly -config="$aptly_conf" publish snapshot -component=contrib -gpg-key=$SIGNING_KEY fluent-package6-$d-${FLUENT_PACKAGE_VERSION}-1 $d
161161
# Place generated files, package files themselves are already in there
162-
tar cf - --exclude="td-agent_*.deb" --exclude="fluent-package_*.deb" -C "$aptly_rootdir/public" $d | tar xvf - -C $FLUENT_RELEASE_DIR/5/ubuntu/
162+
tar cf - --exclude="td-agent_*.deb" --exclude="fluent-package_*.deb" -C "$aptly_rootdir/public" $d | tar xvf - -C $FLUENT_RELEASE_DIR/6/ubuntu/
163163
;;
164164
esac
165165
done
166166
rm -rf "$aptly_rootdir" "$aptly_conf"
167167
;;
168168
rpm)
169169
# resign rpm packages
170-
find $FLUENT_RELEASE_DIR/5 -name "*$FLUENT_PACKAGE_VERSION*.rpm"
170+
find $FLUENT_RELEASE_DIR/6 -name "*$FLUENT_PACKAGE_VERSION*.rpm"
171171
echo "Ready to type signing passphrase? (process starts in 10 seconds, Ctrl+C to abort)"
172172
sleep 10
173173
export GPG_TTY=$(tty)
174-
find $FLUENT_RELEASE_DIR/5 -name "*$FLUENT_PACKAGE_VERSION*.rpm" | xargs rpm --resign --define "_gpg_name $SIGNING_KEY"
174+
find $FLUENT_RELEASE_DIR/6 -name "*$FLUENT_PACKAGE_VERSION*.rpm" | xargs rpm --resign --define "_gpg_name $SIGNING_KEY"
175175
# check whether packages are signed correctly.
176-
find $FLUENT_RELEASE_DIR/5 -name "*$FLUENT_PACKAGE_VERSION*.rpm" | xargs rpm -K || \
176+
find $FLUENT_RELEASE_DIR/6 -name "*$FLUENT_PACKAGE_VERSION*.rpm" | xargs rpm -K || \
177177
(echo "Import public key to verify: rpm --import https://s3.amazonaws.com/packages.treasuredata.com/GPG-KEY-fluent-package" && exit 1)
178178

179179
# update & sign rpm repository
180-
repodirs=`find "${FLUENT_RELEASE_DIR}" -regex "^${FLUENT_RELEASE_DIR}/5/\(redhat\|amazon\)/\([2789]\|2023\)/\(x86_64\|aarch64\)$"`
180+
repodirs=`find "${FLUENT_RELEASE_DIR}" -regex "^${FLUENT_RELEASE_DIR}/6/\(redhat\|amazon\)/\([2789]\|10\|2023\)/\(x86_64\|aarch64\)$"`
181181
for repodir in $repodirs; do
182182
createrepo_c -v --compatibility "${repodir}"
183183

‎fluent-package/test-install-in-docker.sh

Lines changed: 25 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ function setup_dnf_user()
4343
esac
4444
$DNF update -y
4545
case $VERSION_ID in
46-
*2023*|*9\.*)
46+
*2023*|*9\.*|*10\.*)
4747
# curl-minimal should be used by default
4848
$DNF install -y sudo expect shadow-utils passwd util-linux
4949
;;
@@ -95,18 +95,18 @@ case $ID in
9595
bookworm|trixie|jammy|noble)
9696
setup_apt_user
9797
case $REPO in
98-
5)
99-
curl -fsSL https://toolbelt.treasuredata.com/sh/install-$ID-$CODENAME-fluent-package5.sh | sh
98+
6)
99+
curl -fsSL https://toolbelt.treasuredata.com/sh/install-$ID-$CODENAME-fluent-package6.sh | sh
100100
;;
101-
lts/5)
102-
curl -fsSL https://toolbelt.treasuredata.com/sh/install-$ID-$CODENAME-fluent-package5-lts.sh | sh
101+
lts/6)
102+
curl -fsSL https://toolbelt.treasuredata.com/sh/install-$ID-$CODENAME-fluent-package6-lts.sh | sh
103103
;;
104-
exp/5)
105-
curl -fsSL https://toolbelt.treasuredata.com/sh/install-$ID-$CODENAME-fluent-package5.sh | sh
104+
exp/6)
105+
curl -fsSL https://toolbelt.treasuredata.com/sh/install-$ID-$CODENAME-fluent-package6.sh | sh
106106
sudo sed -i -e 's,/5,/test/experimental/5,' /etc/apt/sources.list.d/fluent.sources
107107
;;
108-
exp/lts/5)
109-
curl -fsSL https://toolbelt.treasuredata.com/sh/install-$ID-$CODENAME-fluent-package5-lts.sh | sh
108+
exp/lts/6)
109+
curl -fsSL https://toolbelt.treasuredata.com/sh/install-$ID-$CODENAME-fluent-package6-lts.sh | sh
110110
sudo sed -i -e 's,/lts/5,/test/experimental/lts/5,' /etc/apt/sources.list.d/fluent-lts.sources
111111
;;
112112
esac
@@ -122,18 +122,18 @@ case $ID in
122122
VERSION_ID=$(cat /etc/os-release | grep VERSION_ID | cut -d'=' -f2)
123123
setup_dnf_user
124124
case $REPO in
125-
5)
126-
curl -fsSL https://toolbelt.treasuredata.com/sh/install-redhat-fluent-package5.sh | sh
125+
6)
126+
curl -fsSL https://toolbelt.treasuredata.com/sh/install-redhat-fluent-package6.sh | sh
127127
;;
128-
lts/5)
129-
curl -fsSL https://toolbelt.treasuredata.com/sh/install-redhat-fluent-package5-lts.sh | sh
128+
lts/6)
129+
curl -fsSL https://toolbelt.treasuredata.com/sh/install-redhat-fluent-package6-lts.sh | sh
130130
;;
131-
exp/5)
132-
curl -fsSL https://toolbelt.treasuredata.com/sh/install-redhat-fluent-package5.sh | sh
131+
exp/6)
132+
curl -fsSL https://toolbelt.treasuredata.com/sh/install-redhat-fluent-package6.sh | sh
133133
sudo sed -i -e 's,/5,/test/experimental/5,' /etc/yum.repos.d/fluent-package.repo
134134
;;
135-
exp/lts/5)
136-
curl -fsSL https://toolbelt.treasuredata.com/sh/install-redhat-fluent-package5-lts.sh | sh
135+
exp/lts/6)
136+
curl -fsSL https://toolbelt.treasuredata.com/sh/install-redhat-fluent-package6-lts.sh | sh
137137
sudo sed -i -e 's,/lts/5,/test/experimental/lts/5,' /etc/yum.repos.d/fluent-package-lts.repo
138138
;;
139139
esac
@@ -147,38 +147,18 @@ case $ID in
147147
*2023*)
148148
setup_dnf_user
149149
case $REPO in
150-
5)
151-
curl -fsSL https://toolbelt.treasuredata.com/sh/install-amazon2023-fluent-package5.sh | sh
150+
6)
151+
curl -fsSL https://toolbelt.treasuredata.com/sh/install-amazon2023-fluent-package6.sh | sh
152152
;;
153-
lts/5)
154-
curl -fsSL https://toolbelt.treasuredata.com/sh/install-amazon2023-fluent-package5-lts.sh | sh
153+
lts/6)
154+
curl -fsSL https://toolbelt.treasuredata.com/sh/install-amazon2023-fluent-package6-lts.sh | sh
155155
;;
156-
exp/5)
157-
curl -fsSL https://toolbelt.treasuredata.com/sh/install-amazon2023-fluent-package5.sh | sh
156+
exp/6)
157+
curl -fsSL https://toolbelt.treasuredata.com/sh/install-amazon2023-fluent-package6.sh | sh
158158
sudo sed -i -e 's,/5,/test/experimental/5,' /etc/yum.repos.d/fluent-package.repo
159159
;;
160-
exp/lts/5)
161-
curl -fsSL https://toolbelt.treasuredata.com/sh/install-amazon2023-fluent-package5-lts.sh | sh
162-
sudo sed -i -e 's,/lts/5,/test/experimental/lts/5,' /etc/yum.repos.d/fluent-package-lts.repo
163-
;;
164-
esac
165-
;;
166-
*2*)
167-
DNF=yum
168-
setup_dnf_user
169-
case $REPO in
170-
5)
171-
curl -fsSL https://toolbelt.treasuredata.com/sh/install-amazon2-fluent-package5.sh | sh
172-
;;
173-
lts/5)
174-
curl -fsSL https://toolbelt.treasuredata.com/sh/install-amazon2-fluent-package5-lts.sh | sh
175-
;;
176-
exp/5)
177-
curl -fsSL https://toolbelt.treasuredata.com/sh/install-amazon2-fluent-package5.sh | sh
178-
sudo sed -i -e 's,/5,/test/experimental/5,' /etc/yum.repos.d/fluent-package.repo
179-
;;
180-
exp/lts/5)
181-
curl -fsSL https://toolbelt.treasuredata.com/sh/install-amazon2-fluent-package5-lts.sh | sh
160+
exp/lts/6)
161+
curl -fsSL https://toolbelt.treasuredata.com/sh/install-amazon2023-fluent-package6-lts.sh | sh
182162
sudo sed -i -e 's,/lts/5,/test/experimental/lts/5,' /etc/yum.repos.d/fluent-package-lts.repo
183163
;;
184164
esac

‎fluent-package/test-verify-repo.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,13 @@ fi
5151
VERSION=$1
5252

5353
if [ -z "$DEB_TARGETS" ]; then
54-
DEB_TARGETS="debian:bullseye debian:bookworm ubuntu:focal ubuntu:jammy ubuntu:noble"
54+
DEB_TARGETS="debian:bookworm debian:trixie ubuntu:jammy ubuntu:noble"
5555
fi
5656
if [ -z "$RPM_TARGETS" ]; then
57-
RPM_TARGETS="almalinux:8 rockylinux:9 amazonlinux:2023"
57+
RPM_TARGETS="rockylinux:8 almalinux:9 almalinux:10 amazonlinux:2023"
5858
fi
5959
if [ -z "$REPO_TARGETS" ]; then
60-
REPO_TARGETS="exp/5 exp/lts/5"
60+
REPO_TARGETS="exp/6 exp/lts/6"
6161
fi
6262

6363
echo "DEB_TARGETS: $DEB_TARGETS"

0 commit comments

Comments
 (0)