Skip to content

Backport(v6) deb rpm: use packages.fluentd.org (#1128) #1131

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 1 commit into from
Oct 19, 2026
Merged

Backport(v6) deb rpm: use packages.fluentd.org (#1128) #1131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions fluent-apt-source/Rakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class FluentdAptSourcePackageTask < PackageTask
end

def repository_version
"2026.4.29"
"2026.10.29"
end

def repository_name
Expand All @@ -50,7 +50,11 @@ class FluentdAptSourcePackageTask < PackageTask
end

def repository_url
"https://fluentd.cdn.cncf.io"
# Navigate to scarf.sh by default
# packages.fluentd.org
# => fluentd.gateway.scarf.sh
# => fluentd.cdn.cncf.io
"https://packages.fluentd.org"
end

def repository_gpg_key_ids
Expand Down
7 changes: 7 additions & 0 deletions fluent-apt-source/debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
fluent-apt-source (2026.10.29-1) unstable; urgency=medium

* Non-maintainer upload.
* Use packages.fluentd.org as gateway.

-- Kentaro Hayashi <hayashi@clear-code.com> Thu, 29 Oct 2026 18:45:55 +0900

fluent-apt-source (2026.4.29-1) unstable; urgency=medium

* New upstream release.
Expand Down
2 changes: 1 addition & 1 deletion fluent-apt-source/debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Source: fluent-apt-source
Section: misc
Priority: optional
Maintainer: Fluentd developers <fluentd@googlegroups.com>
Maintainer: Fluentd developers <cncf-fluentd-maintainers@lists.cncf.io>
Build-Depends:
debhelper-compat (= 12),
gnupg,
Expand Down
2 changes: 1 addition & 1 deletion fluent-apt-source/debian/rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ override_dh_auto_build:
component=main; \
fi; \
echo "Types: deb"; \
echo "URIs: https://fluentd.cdn.cncf.io/6/$${distribution}/$${code_name}/"; \
echo "URIs: https://packages.fluentd.org/6/$${distribution}/$${code_name}/"; \
echo "Suites: $${code_name}"; \
echo "Components: contrib"; \
echo "Architectures: amd64 arm64"; \
Expand Down
8 changes: 6 additions & 2 deletions fluent-lts-apt-source/Rakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class FluentdAptLtsSourcePackageTask < PackageTask
end

def repository_version
"2026.4.29"
"2026.10.29"
end

def repository_name
Expand All @@ -50,7 +50,11 @@ class FluentdAptLtsSourcePackageTask < PackageTask
end

def repository_url
"https://fluentd.cdn.cncf.io"
# Navigate to scarf.sh by default
# packages.fluentd.org
# => fluentd.gateway.scarf.sh
# => fluentd.cdn.cncf.io
"https://packages.fluentd.org"
end

def repository_gpg_key_ids
Expand Down
7 changes: 7 additions & 0 deletions fluent-lts-apt-source/debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
fluent-lts-apt-source (2026.10.29-1) unstable; urgency=medium

* New upstream release.
* Use packages.fluentd.org as gateway.

-- Kentaro Hayashi <hayashi@clear-code.com> Thu, 29 Oct 2026 18:44:25 +0900

fluent-lts-apt-source (2026.4.29-1) unstable; urgency=medium

* New upstream release.
Expand Down
2 changes: 1 addition & 1 deletion fluent-lts-apt-source/debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Source: fluent-lts-apt-source
Section: misc
Priority: optional
Maintainer: Fluentd developers <fluentd@googlegroups.com>
Maintainer: Fluentd developers <cncf-fluentd-maintainers@lists.cncf.io>
Build-Depends:
debhelper-compat (= 12),
gnupg,
Expand Down
2 changes: 1 addition & 1 deletion fluent-lts-apt-source/debian/rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ override_dh_auto_build:
component=main; \
fi; \
echo "Types: deb"; \
echo "URIs: https://fluentd.cdn.cncf.io/lts/6/$${distribution}/$${code_name}/"; \
echo "URIs: https://packages.fluentd.org/lts/6/$${distribution}/$${code_name}/"; \
echo "Suites: $${code_name}"; \
echo "Components: contrib"; \
echo "Architectures: amd64 arm64"; \
Expand Down
10 changes: 6 additions & 4 deletions fluent-lts-release/Rakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class FluentReleasePackageTask < PackageTask
end

def repository_version
"2025.9.29"
"2026.10.29"
end

def repository_label
Expand All @@ -30,9 +30,11 @@ class FluentReleasePackageTask < PackageTask
end

def repository_url
# Navigate to R2 by default
# "https://packages.treasuredata.com"
"https://fluentd.cdn.cncf.io"
# Navigate to scarf.sh by default
# packages.fluentd.org
# => fluentd.gateway.scarf.sh
# => fluentd.cdn.cncf.io
"https://packages.fluentd.org"
end

def define
Expand Down
4 changes: 4 additions & 0 deletions fluent-lts-release/yum/fluent-lts-release.spec.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,10 @@ fi
%config(noreplace) %{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-fluent-package

%changelog
* Thu Oct 29 2026 Kentaro Hayashi <hayashi@clear-code.com> - 2026.10.29-1
- New upstream release.
- Use packages.fluentd.org as gateway.

* Wed Sep 24 2025 Shizuo Fujita <fujita@clear-code.com> - 2025.9.29-1
- New upstream release.

Expand Down
2 changes: 1 addition & 1 deletion fluent-lts-release/yum/systemd-test/install-from-r2.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ test -f /etc/pki/rpm-gpg/RPM-GPG-KEY-td-agent
test -f /etc/pki/rpm-gpg/RPM-GPG-KEY-fluent-package

test -f /etc/yum.repos.d/fluent-package-lts.repo
grep fluentd.cdn.cncf.io /etc/yum.repos.d/fluent-package-lts.repo
grep packages.fluentd.org /etc/yum.repos.d/fluent-package-lts.repo
test $($DNF repolist --enabled | grep 'Fluentd Project' | wc -l) -eq 1
test $($DNF repolist --enabled | grep 'Fluentd Project' | cut -d' ' -f1) = fluent-package-v6-lts

Expand Down
10 changes: 6 additions & 4 deletions fluent-release/Rakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class FluentReleasePackageTask < PackageTask
end

def repository_version
"2025.9.29"
"2026.10.29"
end

def repository_label
Expand All @@ -30,9 +30,11 @@ class FluentReleasePackageTask < PackageTask
end

def repository_url
# Navigate to R2 by default
# "https://packages.treasuredata.com"
"https://fluentd.cdn.cncf.io"
# Navigate to scarf.sh by default
# packages.fluentd.org
# => fluentd.gateway.scarf.sh
# => fluentd.cdn.cncf.io
"https://packages.fluentd.org"
end

def define
Expand Down
4 changes: 4 additions & 0 deletions fluent-release/yum/fluent-release.spec.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,10 @@ fi
%config(noreplace) %{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-fluent-package

%changelog
* Thu Oct 29 2026 Kentaro Hayashi <hayashi@clear-code.com> - 2026.10.29-1
- New upstream release.
- Use packages.fluentd.org as gateway.

* Wed Sep 24 2025 Shizuo Fujita <fujita@clear-code.com> - 2025.9.29-1
- New upstream release.

Expand Down
2 changes: 1 addition & 1 deletion fluent-release/yum/systemd-test/install-from-r2.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ test -f /etc/pki/rpm-gpg/RPM-GPG-KEY-td-agent
test -f /etc/pki/rpm-gpg/RPM-GPG-KEY-fluent-package

test -f /etc/yum.repos.d/fluent-package.repo
grep fluentd.cdn.cncf.io /etc/yum.repos.d/fluent-package.repo
grep packages.fluentd.org /etc/yum.repos.d/fluent-package.repo
test $($DNF repolist --enabled | grep 'Fluentd Project' | wc -l) -eq 1
test $($DNF repolist --enabled | grep 'Fluentd Project' | cut -d' ' -f1) = fluent-package-v6

Expand Down
Loading