Add support for RPM customizations
Add support for RPM customizations, which currently allow to import RPM GPG key from a file installed in the image. This is e.g. done for the Azure RHUI image type. Signed-off-by: Tomáš Hozza <thozza@redhat.com>
This commit is contained in:
parent
7d22c42ad7
commit
26dd54a4d7
14 changed files with 303 additions and 185 deletions
|
|
@ -445,6 +445,17 @@ EOF
|
|||
)
|
||||
export FIREWALL_CUSTOMIZATION_BLOCK
|
||||
|
||||
RPM_CUSTOMIZATION_BLOCK=$(cat <<EOF
|
||||
,
|
||||
"rpm": {
|
||||
"import_keys": {
|
||||
"files": ["/etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta"]
|
||||
}
|
||||
}
|
||||
EOF
|
||||
)
|
||||
export RPM_CUSTOMIZATION_BLOCK
|
||||
|
||||
if [ "$TEST_MODULE_HOTFIXES" = "1" ]; then
|
||||
if [ "$ARCH" = "x86_64" ]; then
|
||||
NGINX_REPO_URL="https://rpmrepo.osbuild.org/v2/mirror/public/el8/el8-x86_64-nginx-20240626"
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ function createReqFile() {
|
|||
"key": "$(cat "${WORKDIR}/usertest.pub")"
|
||||
}
|
||||
]${SUBSCRIPTION_BLOCK}${DIR_FILES_CUSTOMIZATION_BLOCK}${REPOSITORY_CUSTOMIZATION_BLOCK}${OPENSCAP_CUSTOMIZATION_BLOCK}
|
||||
${TIMEZONE_CUSTOMIZATION_BLOCK}
|
||||
${TIMEZONE_CUSTOMIZATION_BLOCK}${RPM_CUSTOMIZATION_BLOCK}
|
||||
},
|
||||
"image_request": {
|
||||
"architecture": "$ARCH",
|
||||
|
|
|
|||
|
|
@ -85,7 +85,7 @@ function createReqFile() {
|
|||
"postgresql",
|
||||
"dummy"
|
||||
]${SUBSCRIPTION_BLOCK}${DIR_FILES_CUSTOMIZATION_BLOCK}${REPOSITORY_CUSTOMIZATION_BLOCK}${OPENSCAP_CUSTOMIZATION_BLOCK}
|
||||
${TIMEZONE_CUSTOMIZATION_BLOCK}${FIREWALL_CUSTOMIZATION_BLOCK}
|
||||
${TIMEZONE_CUSTOMIZATION_BLOCK}${FIREWALL_CUSTOMIZATION_BLOCK}${RPM_CUSTOMIZATION_BLOCK}
|
||||
},
|
||||
"image_request": {
|
||||
"architecture": "$ARCH",
|
||||
|
|
|
|||
|
|
@ -84,7 +84,7 @@ function createReqFileGuest() {
|
|||
"key": "$(cat "${WORKDIR}/usertest.pub")"
|
||||
}
|
||||
]${SUBSCRIPTION_BLOCK}${DIR_FILES_CUSTOMIZATION_BLOCK}${REPOSITORY_CUSTOMIZATION_BLOCK}${OPENSCAP_CUSTOMIZATION_BLOCK}
|
||||
${TIMEZONE_CUSTOMIZATION_BLOCK}${FIREWALL_CUSTOMIZATION_BLOCK}
|
||||
${TIMEZONE_CUSTOMIZATION_BLOCK}${FIREWALL_CUSTOMIZATION_BLOCK}${RPM_CUSTOMIZATION_BLOCK}
|
||||
},
|
||||
"image_request": {
|
||||
"architecture": "$ARCH",
|
||||
|
|
@ -114,7 +114,7 @@ function createReqFileVSphere() {
|
|||
"postgresql",
|
||||
"dummy"${EXTRA_PACKAGES_BLOCK}
|
||||
]${SUBSCRIPTION_BLOCK}${DIR_FILES_CUSTOMIZATION_BLOCK}
|
||||
${TIMEZONE_CUSTOMIZATION_BLOCK}${FIREWALL_CUSTOMIZATION_BLOCK}
|
||||
${TIMEZONE_CUSTOMIZATION_BLOCK}${FIREWALL_CUSTOMIZATION_BLOCK}${RPM_CUSTOMIZATION_BLOCK}
|
||||
},
|
||||
"image_request": {
|
||||
"architecture": "$ARCH",
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@ function createReqFile() {
|
|||
"postgresql",
|
||||
"dummy"
|
||||
]${SUBSCRIPTION_BLOCK}${DIR_FILES_CUSTOMIZATION_BLOCK}${REPOSITORY_CUSTOMIZATION_BLOCK}${OPENSCAP_CUSTOMIZATION_BLOCK}
|
||||
${TIMEZONE_CUSTOMIZATION_BLOCK}${FIREWALL_CUSTOMIZATION_BLOCK}
|
||||
${TIMEZONE_CUSTOMIZATION_BLOCK}${FIREWALL_CUSTOMIZATION_BLOCK}${RPM_CUSTOMIZATION_BLOCK}
|
||||
},
|
||||
"image_request": {
|
||||
"architecture": "$ARCH",
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue