diff --git a/diskimage_builder/elements/epel/pkg-map b/diskimage_builder/elements/epel/pkg-map index 4cdc3fdf..d5ff8db0 100644 --- a/diskimage_builder/elements/epel/pkg-map +++ b/diskimage_builder/elements/epel/pkg-map @@ -11,6 +11,10 @@ "rhel7": { "wget": "wget", "yum-utils": "yum-utils" + }, + "rocky": { + "wget": "wget", + "yum-utils": "yum-utils" } }, "default": { diff --git a/diskimage_builder/elements/epel/pre-install.d/05-rpm-epel-release b/diskimage_builder/elements/epel/pre-install.d/05-rpm-epel-release index 1d3816a9..3a5c6546 100755 --- a/diskimage_builder/elements/epel/pre-install.d/05-rpm-epel-release +++ b/diskimage_builder/elements/epel/pre-install.d/05-rpm-epel-release @@ -6,7 +6,7 @@ fi set -eu set -o pipefail -if [[ ${DISTRO_NAME} =~ "centos" && "${DIB_RELEASE%-stream}" -lt '9' ]]; then +if [[ (${DISTRO_NAME} =~ "centos" || ${DISTRO_NAME} =~ "rocky") && "${DIB_RELEASE%-stream}" -lt '9' ]]; then # Centos has "epel-release" in extras, which is default enabled. ${YUM} install -y epel-release else diff --git a/diskimage_builder/elements/rocky-container/test-elements/build-succeeds/element-deps b/diskimage_builder/elements/rocky-container/test-elements/build-succeeds/element-deps index 4be9e9fe..73b3d4e1 100644 --- a/diskimage_builder/elements/rocky-container/test-elements/build-succeeds/element-deps +++ b/diskimage_builder/elements/rocky-container/test-elements/build-succeeds/element-deps @@ -1,2 +1 @@ -openstack-ci-mirrors vm