particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

🐣 Use RHEL 8.3 beta content from CDN

Browse source 
Remove the nightly repos from the RHEL 8.3 jobs and replace them with
CDN registration for beta content.

Signed-off-by: Major Hayden <major@redhat.com>
This commit is contained in:
Major Hayden 2020-07-29 11:33:02 -05:00 • committed by Major Hayden
parent 61e6e5f500
commit 484bb9a182
2 changed files with 18 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
schutzbot/Jenkinsfile vendored
View file

@ -88,8 +88,7 @@ pipeline {
agent { label "rhel83cloudbase && x86_64" } agent { label "rhel83cloudbase && x86_64" }
environment { environment {
AWS_CREDS = credentials('aws-credentials-osbuildci') AWS_CREDS = credentials('aws-credentials-osbuildci')
NIGHTLY_REPO = credentials('rhel8-nightly-repo') RHN_REGISTRATION_SCRIPT = credentials('rhn-register-script-production-beta')
NIGHTLY_MOCK_TEMPLATE = credentials('rhel8-nightly-mock-template')
} }
steps { steps {
sh "schutzbot/ci_details.sh" sh "schutzbot/ci_details.sh"
@ -259,7 +258,10 @@ pipeline {
stage('EL8.3 Base') { stage('EL8.3 Base') {
agent { label "rhel83cloudbase && x86_64" } agent { label "rhel83cloudbase && x86_64" }
environment { TEST_TYPE = "base" } environment {
TEST_TYPE = "base"
RHN_REGISTRATION_SCRIPT = credentials('rhn-register-script-production-beta')
}
steps { steps {
unstash 'rhel83' unstash 'rhel83'
run_tests('base') run_tests('base')
@ -277,6 +279,7 @@ pipeline {
AWS_CREDS = credentials('aws-credentials-osbuildci') AWS_CREDS = credentials('aws-credentials-osbuildci')
AZURE_CREDS = credentials('azure') AZURE_CREDS = credentials('azure')
OPENSTACK_CREDS = credentials("psi-openstack-clouds-yaml") OPENSTACK_CREDS = credentials("psi-openstack-clouds-yaml")
RHN_REGISTRATION_SCRIPT = credentials('rhn-register-script-production-beta')
} }
steps { steps {
unstash 'rhel83' unstash 'rhel83'
@ -293,6 +296,7 @@ pipeline {
environment { environment {
TEST_TYPE = "integration" TEST_TYPE = "integration"
AWS_CREDS = credentials('aws-credentials-osbuildci') AWS_CREDS = credentials('aws-credentials-osbuildci')
RHN_REGISTRATION_SCRIPT = credentials('rhn-register-script-production-beta')
} }
steps { steps {
unstash 'rhel83' unstash 'rhel83'

17
schutzbot/mockbuild.sh
View file

@ -69,12 +69,17 @@ greenprint "🔧 Building source RPMs."
make srpm make srpm
make -C osbuild srpm make -C osbuild srpm
# Fix RHEL 8 mock template for non-subscribed images. # Update the mock configs if we are on 8.3 beta.
if [[ "${ID}${VERSION_ID//./}" == rhel83 ]]; then if [[ $VERSION_ID == 8.3 ]]; then
greenprint "📋 Updating RHEL 8 mock template for unsubscribed image" # Remove the existing (non-beta) repos from the template.
sudo cp $NIGHTLY_MOCK_TEMPLATE /etc/mock/templates/rhel-8.tpl sudo sed -i '/# repos/q' /etc/mock/templates/rhel-8.tpl
cat $NIGHTLY_REPO | sudo tee -a /etc/mock/templates/rhel-8.tpl > /dev/null
echo '"""' | sudo tee -a /etc/mock/templates/rhel-8.tpl > /dev/null # Add the enabled repos to the template.
cat /etc/yum.repos.d/redhat.repo | sudo tee -a /etc/mock/templates/rhel-8.tpl
# 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 fi
# Compile RPMs in a mock chroot # Compile RPMs in a mock chroot