schutzbot: add RHEL 8.5

This commit is contained in:
Achilleas Koutsou 2021-04-15 16:06:17 +02:00 committed by Ondřej Budai
parent eb74ddf2ef
commit 1476b88dcf
2 changed files with 20 additions and 1 deletions

11
schutzbot/Jenkinsfile vendored
View file

@ -95,6 +95,17 @@ pipeline {
sh "schutzbot/mockbuild.sh"
}
}
stage('RHEL 8.5') {
agent { label "rhel85cloudbase && x86_64 && psi" }
environment {
AWS_CREDS = credentials('aws-credentials-osbuildci')
RHEL85_NIGHTLY_REPO = credentials('rhel85-nightly-repo')
}
steps {
sh "schutzbot/ci_details.sh"
sh "schutzbot/mockbuild.sh"
}
}
stage('CS8') {
agent { label "cs8cloudbase && x86_64 && aws" }
environment {

View file

@ -69,7 +69,7 @@ greenprint "📤 RPMS will be uploaded to: ${REPO_URL}"
# Build source RPMs.
greenprint "🔧 Building source RPMs."
make srpm
# rhel 8.4 will run off of the nightly repos and does not have a redhat subscription
# rhel 8.4 and 8.5 will run off of the internal repos and does not have a redhat subscription
if [[ $VERSION_ID == 8.4 ]]; then
greenprint "📋 Updating RHEL 8 mock template for unsubscribed image"
sudo sed -i '/# repos/q' /etc/mock/templates/rhel-8.tpl
@ -78,6 +78,14 @@ if [[ $VERSION_ID == 8.4 ]]; then
cat "$RHEL84_NIGHTLY_REPO" | sudo tee -a /etc/mock/templates/rhel-8.tpl > /dev/null
# We need triple quotes at the end of the template to mark the end of the repo list.
echo '"""' | sudo tee -a /etc/mock/templates/rhel-8.tpl
elif [[ $VERSION_ID == 8.5 ]]; then
greenprint "📋 Updating RHEL 8 mock template for unsubscribed image"
sudo sed -i '/# repos/q' /etc/mock/templates/rhel-8.tpl
# remove the subscription check
sudo sed -i "s/config_opts\['redhat_subscription_required'\] = True/config_opts['redhat_subscription_required'] = False/" /etc/mock/templates/rhel-8.tpl
cat "$RHEL85_NIGHTLY_REPO" | sudo tee -a /etc/mock/templates/rhel-8.tpl > /dev/null
# We need triple quotes at the end of the template to mark the end of the repo list.
echo '"""' | sudo tee -a /etc/mock/templates/rhel-8.tpl
fi
# Compile RPMs in a mock chroot