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

schutzbot: drop RHEL 8.3 stages

Browse source 
RHEL 8.3 is already GA therefore we don't need to test it anymore!
This commit is contained in:
Ondřej Budai 2020-11-05 19:47:18 +01:00
parent cbb8640266
commit 543f1f4cce
2 changed files with 0 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

79
schutzbot/Jenkinsfile vendored
View file

@ -92,24 +92,6 @@ pipeline {
)
}
}
stage('EL8.3') {
agent { label "rhel83cloudbase && x86_64 && aws" }
environment {
AWS_CREDS = credentials('aws-credentials-osbuildci')
AWS_IMAGE_TEST_CREDS = credentials('aws-credentials-osbuild-image-test')
RHN_REGISTRATION_SCRIPT = credentials('rhn-register-script-production-beta')
}
steps {
sh "schutzbot/ci_details.sh"
retry(3) {
sh "schutzbot/mockbuild.sh"
}
stash (
includes: 'osbuild-mock.repo',
name: 'rhel83'
)
}
}
}
}
@ -255,67 +237,6 @@ pipeline {
}
}
}
stage('EL8.3 Base') {
agent { label "rhel83cloudbase && x86_64 && aws" }
environment {
TEST_TYPE = "base"
RHN_REGISTRATION_SCRIPT = credentials('rhn-register-script-production-beta')
}
steps {
unstash 'rhel83'
run_tests('base')
}
post {
always {
preserve_logs('rhel83-base')
}
}
}
stage('EL8.3 Image') {
agent { label "rhel83cloudbase && psi && x86_64" }
environment {
TEST_TYPE = "image"
AWS_CREDS = credentials('aws-credentials-osbuildci')
AWS_IMAGE_TEST_CREDS = credentials('aws-credentials-osbuild-image-test')
AZURE_CREDS = credentials('azure')
OPENSTACK_CREDS = credentials("psi-openstack-creds")
RHN_REGISTRATION_SCRIPT = credentials('rhn-register-script-production-beta')
VCENTER_CREDS = credentials('vmware-vcenter-credentials')
DISTRO_CODE = "rhel83"
}
steps {
unstash 'rhel83'
run_tests('image')
}
post {
always {
preserve_logs('rhel83-image')
sh (
label: "Run cloud cleaner just in case something failed",
script: "schutzbot/run_cloud_cleaner.sh"
)
}
}
}
stage('EL8.3 Integration') {
agent { label "rhel83cloudbase && x86_64 && psi" }
environment {
TEST_TYPE = "integration"
AWS_CREDS = credentials('aws-credentials-osbuildci')
AWS_IMAGE_TEST_CREDS = credentials('aws-credentials-osbuild-image-test')
RHN_REGISTRATION_SCRIPT = credentials('rhn-register-script-production-beta')
}
steps {
unstash 'rhel83'
run_tests('integration')
}
post {
always {
preserve_logs('rhel83-integration')
}
}
}
}
}
}

13
schutzbot/mockbuild.sh
View file

@ -67,19 +67,6 @@ greenprint "🔧 Building source RPMs."
make srpm
make -C osbuild srpm
# Update the mock configs if we are on 8.3 beta.
if [[ $VERSION_ID == 8.3 ]]; then
# Remove the existing (non-beta) repos from the template.
sudo sed -i '/# repos/q' /etc/mock/templates/rhel-8.tpl
# 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
# Compile RPMs in a mock chroot
greenprint "🎁 Building RPMs with mock"
sudo mock -r "$MOCK_CONFIG" --resultdir "$REPO_DIR" --with=tests \