Skip to content

Commit 1de1ea6

Browse files
committed
CI: Switch from td-agent to fluent-package (LTS)
This mirrors what was done in Kolla images [1] and may be a more stable repository. Also fix an outdated comment. [1] https://review.opendev.org/c/openstack/kolla/+/894948 Change-Id: I953b168240edc88e9248a7a1b353d318aa09853c Signed-off-by: Pierre Riteau <[email protected]> (cherry picked from commit 9b5e605)
1 parent 6f83a17 commit 1de1ea6

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ apt_repositories:
146146
suites: noble-security
147147
components: main universe
148148
# Treasuredata repository.
149-
- url: http://packages.treasuredata.com/5/ubuntu/noble/
149+
- url: https://packages.treasuredata.com/lts/5/ubuntu/noble
150150
components: contrib
151151
signed_by: td-agent.asc
152152
apt_preferences:
@@ -178,8 +178,8 @@ dnf_epel_mirror_host: "{{ zuul_site_mirror_fqdn }}"
178178
dnf_epel_mirror_directory: 'epel'
179179
# Configure a custom DNF repository.
180180
dnf_custom_repos:
181-
td-agent:
182-
baseurl: http://packages.treasuredata.com/4/redhat/$releasever/$basearch
181+
fluent-package:
182+
baseurl: https://packages.treasuredata.com/lts/5/redhat/$releasever/$basearch
183183
gpgkey: https://packages.treasuredata.com/GPG-KEY-td-agent
184184
gpgcheck: yes
185185
# Install EPEL local mirror.

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -229,8 +229,8 @@ def test_apt_preferences(host):
229229
@pytest.mark.skipif(not _is_apt(), reason="Apt only supported on Ubuntu")
230230
def test_apt_custom_package_repository_is_available(host):
231231
with host.sudo():
232-
host.check_output("apt -y install td-agent")
233-
assert host.package("td-agent").is_installed
232+
host.check_output("apt -y install fluent-package")
233+
assert host.package("fluent-package").is_installed
234234

235235

236236
@pytest.mark.skipif(not _is_apt(), reason="Apt only supported on Ubuntu")
@@ -246,7 +246,7 @@ def test_apt_auth(host):
246246

247247
@pytest.mark.parametrize('repo', ["appstream", "baseos", "extras", "epel"])
248248
@pytest.mark.skipif(not _is_dnf_mirror(),
249-
reason="DNF OpenDev mirror only for CentOS 8")
249+
reason="DNF OpenDev mirror only for CentOS Stream 9")
250250
def test_dnf_local_package_mirrors(host, repo):
251251
# Depends on SITE_MIRROR_FQDN environment variable.
252252
assert os.getenv('SITE_MIRROR_FQDN')
@@ -261,8 +261,8 @@ def test_dnf_local_package_mirrors(host, repo):
261261
@pytest.mark.skipif(not _is_dnf(), reason="DNF only supported on CentOS/Rocky")
262262
def test_dnf_custom_package_repository_is_available(host):
263263
with host.sudo():
264-
host.check_output("dnf -y install td-agent")
265-
assert host.package("td-agent").is_installed
264+
host.check_output("dnf -y install fluent-package")
265+
assert host.package("fluent-package").is_installed
266266

267267

268268
@pytest.mark.skipif(not _is_dnf(), reason="DNF only supported on CentOS/Rocky")

0 commit comments

Comments
 (0)