Merge "CI: Switch from td-agent to fluent-package (LTS)" into stable/2025.1

Author: Zuul

playbooks/kayobe-overcloud-host-configure-base/overrides.yml.j2

@@ -146,7 +146,7 @@ apt_repositories:
     suites: noble-security
     components: main universe
   # Treasuredata repository.
-  - url:  http://packages.treasuredata.com/5/ubuntu/noble/
+  - url: https://packages.treasuredata.com/lts/5/ubuntu/noble
     components: contrib
     signed_by: td-agent.asc
 apt_preferences:
@@ -178,8 +178,8 @@ dnf_epel_mirror_host: "{{ zuul_site_mirror_fqdn }}"
 dnf_epel_mirror_directory: 'epel'
 # Configure a custom DNF repository.
 dnf_custom_repos:
-  td-agent:
-    baseurl: http://packages.treasuredata.com/4/redhat/$releasever/$basearch
+  fluent-package:
+    baseurl: https://packages.treasuredata.com/lts/5/redhat/$releasever/$basearch
     gpgkey: https://packages.treasuredata.com/GPG-KEY-td-agent
     gpgcheck: yes
 # Install EPEL local mirror.

playbooks/kayobe-overcloud-host-configure-base/tests/test_overcloud_host_configure.py

@@ -229,8 +229,8 @@ def test_apt_preferences(host):
 @pytest.mark.skipif(not _is_apt(), reason="Apt only supported on Ubuntu")
 def test_apt_custom_package_repository_is_available(host):
     with host.sudo():
-        host.check_output("apt -y install td-agent")
-    assert host.package("td-agent").is_installed
+        host.check_output("apt -y install fluent-package")
+    assert host.package("fluent-package").is_installed
 
 
 @pytest.mark.skipif(not _is_apt(), reason="Apt only supported on Ubuntu")
@@ -246,7 +246,7 @@ def test_apt_auth(host):
 
 @pytest.mark.parametrize('repo', ["appstream", "baseos", "extras", "epel"])
 @pytest.mark.skipif(not _is_dnf_mirror(),
-                    reason="DNF OpenDev mirror only for CentOS 8")
+                    reason="DNF OpenDev mirror only for CentOS Stream 9")
 def test_dnf_local_package_mirrors(host, repo):
     # Depends on SITE_MIRROR_FQDN environment variable.
     assert os.getenv('SITE_MIRROR_FQDN')
@@ -261,8 +261,8 @@ def test_dnf_local_package_mirrors(host, repo):
 @pytest.mark.skipif(not _is_dnf(), reason="DNF only supported on CentOS/Rocky")
 def test_dnf_custom_package_repository_is_available(host):
     with host.sudo():
-        host.check_output("dnf -y install td-agent")
-    assert host.package("td-agent").is_installed
+        host.check_output("dnf -y install fluent-package")
+    assert host.package("fluent-package").is_installed
 
 
 @pytest.mark.skipif(not _is_dnf(), reason="DNF only supported on CentOS/Rocky")