Merge pull request #464 from stackhpc/upstream/2025.1-2025-08-25

Synchronise 2025.1 with upstream

Author: priteau

ansible/roles/dnf/templates/epel.repo.j2

@@ -3,21 +3,21 @@ name=Extra Packages for Enterprise Linux $releasever - $basearch
 baseurl=http://{{ dnf_epel_mirror_host }}/{{ dnf_epel_mirror_directory }}/$releasever/Everything/$basearch
 enabled=1
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-{{ ansible_facts.distribution_major_version }}
 fastestmirror=0
 
 [epel-debuginfo]
 name=Extra Packages for Enterprise Linux $releasever - $basearch - Debug
 baseurl=http://{{ dnf_epel_mirror_host }}/{{ dnf_epel_mirror_directory }}/$releasever/Everything/$basearch/debug
 enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-{{ ansible_facts.distribution_major_version }}
 gpgcheck=1
 fastestmirror=0
 
 [epel-source]
 name=Extra Packages for Enterprise Linux $releasever - $basearch - Source
 baseurl=http://{{ dnf_epel_mirror_host }}/{{ dnf_epel_mirror_directory }}/$releasever/Everything/SRPMS
 enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-{{ ansible_facts.distribution_major_version }}
 gpgcheck=1
 fastestmirror=0

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")

releasenotes/notes/bug-2119921-b23dc13147e6bda4.yaml

@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Fixes wrong name of ``gpgkey`` used for EPEL repositories when
+    ``dnf_use_local_mirror`` is enabled.
+    `LP#2119921 <https://bugs.launchpad.net/kayobe/+bug/2119921>`__

zuul.d/project.yaml

@@ -29,7 +29,6 @@
         - kayobe-seed-rocky9-podman
         - kayobe-seed-ubuntu-noble
         - kayobe-seed-ubuntu-noble-podman
-        - kayobe-seed-images-rocky9
         - kayobe-seed-upgrade-rocky9
         - kayobe-seed-upgrade-ubuntu-noble
         - kayobe-seed-upgrade-slurp-rocky9
@@ -76,6 +75,7 @@
         - kayobe-overcloud-centos9s
         - kayobe-overcloud-host-configure-centos9s
         - kayobe-seed-images-centos9s
+        - kayobe-seed-images-rocky9
         - kayobe-seed-images-rocky9-podman
         - kayobe-seed-images-ubuntu-noble
         - kayobe-seed-images-ubuntu-noble-podman