Skip to content

Update target distributions #509

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
merged 2 commits into from
Jun 28, 2023
Merged

Update target distributions #509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
58491cf
Update target distributions
kenhys Jun 27, 2023
27629c6
Fix major version
kenhys Jun 27, 2023
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
6 changes: 3 additions & 3 deletions fluent-package/convert-artifacts-layout.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@ case $1 in
apt|deb)
REPOSITORY_TYPE=apt
REPOSITORY_PATH=$TD_AGENT_DIR/$REPOSITORY_TYPE/repositories
for d in buster bullseye bionic focal jammy; do
for d in bullseye bookworm focal jammy; do
case $d in
buster|bullseye)
bullseye|bookworm)
# e.g. mapping debian/pool/buster/main/t/td-agent/ => 5/debian/buster/pool/contrib/t/td-agent
# mapping debian/pool/buster/main/f/fluent-package/ => 5/debian/buster/pool/contrib/f/fluent-package
mkdir -p $ARTIFACTS_DIR/5/debian/$d/pool/contrib/t/td-agent
mkdir -p $ARTIFACTS_DIR/5/debian/$d/pool/contrib/f/fluent-package
find $REPOSITORY_PATH/debian/pool/$d -name 'td-agent*.deb' -not -name '*dbgsym*' -exec cp {} $ARTIFACTS_DIR/5/debian/$d/pool/contrib/t/td-agent \;
find $REPOSITORY_PATH/debian/pool/$d -name 'fluent-package*.deb' -not -name '*dbgsym*' -exec cp {} $ARTIFACTS_DIR/5/debian/$d/pool/contrib/f/fluent-package \;
;;
bionic|focal|jammy)
focal|jammy)
# e.g. mapping ubuntu/pool/.../main/t/td-agent/ => 5/ubuntu/.../pool/contrib/t/td-agent
# mapping ubuntu/pool/.../main/f/fluent-package/ => 5/ubuntu/.../pool/contrib/f/fluent-package
mkdir -p $ARTIFACTS_DIR/5/ubuntu/$d/pool/contrib/t/td-agent
Expand Down
8 changes: 4 additions & 4 deletions fluent-package/manage-fluent-repositories.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ case $COMMAND in
DRYRUN_OPTION=""
fi
for target in $TARGETS; do
command="aws s3 sync $DRYRUN_OPTION --delete $FLUENT_RELEASE_DIR/4/$target s3://packages.treasuredata.com/4/$target --profile $FLUENT_RELEASE_PROFILE"
command="aws s3 sync $DRYRUN_OPTION --delete $FLUENT_RELEASE_DIR/5/$target s3://packages.treasuredata.com/5/$target --profile $FLUENT_RELEASE_PROFILE"
echo $command
$command
done
Expand Down Expand Up @@ -101,10 +101,10 @@ EOF
echo "Ready to type signing passphrase? (process starts in 10 seconds, Ctrl+C to abort)"
sleep 10
export GPG_TTY=$(tty)
for d in buster bullseye bionic focal jammy; do
for d in bullseye bookworm focal jammy; do
aptly -config="$aptly_conf" repo create -distribution=$d -component=contrib fluent-package5-$d
case $d in
buster|bullseye)
bullseye|bookworm)
aptly -config="$aptly_conf" repo add fluent-package5-$d $FLUENT_RELEASE_DIR/5/debian/$d/
aptly -config="$aptly_conf" snapshot create fluent-package5-$d-${FLUENT_PACKAGE_VERSION}-1 from repo fluent-package5-$d
# publish snapshot with prefix, InRelease looks like (e.g. bullseye):
Expand All @@ -114,7 +114,7 @@ EOF
# Place generated files, package files themselves are already in there
tar cf - --exclude="td-agent_*.deb" --exclude="fluent-package_*.deb" -C "$aptly_rootdir/public" $d | tar xvf - -C $FLUENT_RELEASE_DIR/5/debian/
;;
bionic|focal|jammy)
focal|jammy)
aptly -config="$aptly_conf" repo add fluent-package5-$d $FLUENT_RELEASE_DIR/5/ubuntu/$d/
aptly -config="$aptly_conf" snapshot create fluent-package5-$d-${FLUENT_PACKAGE_VERSION}-1 from repo fluent-package5-$d
# publish snapshot with prefix, InRelease looks like (e.g. focal):
Expand Down