sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Add rocky support to the epel element"

Browse Source
This commit is contained in:
Zuul 2022-02-22 07:40:13 +00:00 committed by Gerrit Code Review
commit 3e4e66de16
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
diskimage_builder/elements/epel/pkg-map
View File

@ -11,6 +11,10 @@
"rhel7": { "rhel7": {
"wget": "wget", "wget": "wget",
"yum-utils": "yum-utils" "yum-utils": "yum-utils"
},
"rocky": {
"wget": "wget",
"yum-utils": "yum-utils"
} }
}, },
"default": { "default": {

2
diskimage_builder/elements/epel/pre-install.d/05-rpm-epel-release
View File

@ -6,7 +6,7 @@ fi
set -eu set -eu
set -o pipefail 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. # Centos has "epel-release" in extras, which is default enabled.
${YUM} install -y epel-release ${YUM} install -y epel-release
else else

1
diskimage_builder/elements/rocky-container/test-elements/build-succeeds/element-deps
View File

@ -1,2 +1 @@
openstack-ci-mirrors
vm vm