test: add UEFI boot qcow 2 tests
x86_64 and aarch64 rhel 8.4 images support hybrid boot. qcow2 images are now tested with both BIOS and UEFI boot. The Jenkinsfile now specifies which boot type is supported when calling run_tests. For the qemu tests, this boot type can be passed as an option so the test can boot using UEFI. In order to boot using uefi from a rhel machine, we must pass the --boot uefi flag as well as tell libvirt where the variable store template is. Since we are not testing secureboot, we must pass nvram_template=/usr/share/edk2/ovmf/OVMF_VARS.fd to the --boot flag. This is the location of our non-secureboot varstore template.
This commit is contained in:
parent
7b40a3b38e
commit
4e70a291b1
2 changed files with 57 additions and 31 deletions
46
schutzbot/Jenkinsfile
vendored
46
schutzbot/Jenkinsfile
vendored
|
|
@ -105,7 +105,7 @@ pipeline {
|
|||
agent { label "f32cloudbase && x86_64 && aws" }
|
||||
environment { TEST_TYPE = "base" }
|
||||
steps {
|
||||
run_tests('base')
|
||||
run_tests('base', 'bios')
|
||||
}
|
||||
post {
|
||||
always {
|
||||
|
|
@ -125,7 +125,7 @@ pipeline {
|
|||
DISTRO_CODE = "fedora32"
|
||||
}
|
||||
steps {
|
||||
run_tests('image')
|
||||
run_tests('image', 'bios')
|
||||
}
|
||||
post {
|
||||
always {
|
||||
|
|
@ -145,7 +145,7 @@ pipeline {
|
|||
AWS_IMAGE_TEST_CREDS = credentials('aws-credentials-osbuild-image-test')
|
||||
}
|
||||
steps {
|
||||
run_tests('integration')
|
||||
run_tests('integration', 'bios')
|
||||
}
|
||||
post {
|
||||
always {
|
||||
|
|
@ -156,7 +156,7 @@ pipeline {
|
|||
stage('F32 OSTree') {
|
||||
agent { label "f32cloudbase && psi && x86_64" }
|
||||
steps {
|
||||
run_tests('ostree')
|
||||
run_tests('ostree', 'bios')
|
||||
}
|
||||
post {
|
||||
always {
|
||||
|
|
@ -168,7 +168,7 @@ pipeline {
|
|||
agent { label "f33cloudbase && x86_64 && aws" }
|
||||
environment { TEST_TYPE = "base" }
|
||||
steps {
|
||||
run_tests('base')
|
||||
run_tests('base', 'bios')
|
||||
}
|
||||
post {
|
||||
always {
|
||||
|
|
@ -188,7 +188,7 @@ pipeline {
|
|||
DISTRO_CODE = "fedora33"
|
||||
}
|
||||
steps {
|
||||
run_tests('image')
|
||||
run_tests('image', 'bios')
|
||||
}
|
||||
post {
|
||||
always {
|
||||
|
|
@ -204,7 +204,7 @@ pipeline {
|
|||
AWS_IMAGE_TEST_CREDS = credentials('aws-credentials-osbuild-image-test')
|
||||
}
|
||||
steps {
|
||||
run_tests('integration')
|
||||
run_tests('integration', 'bios')
|
||||
}
|
||||
post {
|
||||
always {
|
||||
|
|
@ -215,7 +215,7 @@ pipeline {
|
|||
stage('F33 OSTree') {
|
||||
agent { label "f33cloudbase && psi && x86_64" }
|
||||
steps {
|
||||
run_tests('ostree')
|
||||
run_tests('ostree', 'bios')
|
||||
}
|
||||
post {
|
||||
always {
|
||||
|
|
@ -230,7 +230,7 @@ pipeline {
|
|||
RHN_REGISTRATION_SCRIPT = credentials('rhn-register-script-production')
|
||||
}
|
||||
steps {
|
||||
run_tests('base')
|
||||
run_tests('base', 'bios')
|
||||
}
|
||||
post {
|
||||
always {
|
||||
|
|
@ -251,7 +251,7 @@ pipeline {
|
|||
DISTRO_CODE = "rhel8"
|
||||
}
|
||||
steps {
|
||||
run_tests('image')
|
||||
run_tests('image', 'bios')
|
||||
}
|
||||
post {
|
||||
always {
|
||||
|
|
@ -272,7 +272,7 @@ pipeline {
|
|||
RHN_REGISTRATION_SCRIPT = credentials('rhn-register-script-production')
|
||||
}
|
||||
steps {
|
||||
run_tests('integration')
|
||||
run_tests('integration', 'bios')
|
||||
}
|
||||
post {
|
||||
always {
|
||||
|
|
@ -283,7 +283,7 @@ pipeline {
|
|||
stage('EL8 OSTree') {
|
||||
agent { label "rhel8cloudbase && psi && x86_64" }
|
||||
steps {
|
||||
run_tests('ostree')
|
||||
run_tests('ostree', 'bios')
|
||||
}
|
||||
post {
|
||||
always {
|
||||
|
|
@ -297,7 +297,7 @@ pipeline {
|
|||
TEST_TYPE = "base"
|
||||
}
|
||||
steps {
|
||||
run_tests('base')
|
||||
run_tests('base', 'hybrid')
|
||||
}
|
||||
post {
|
||||
always {
|
||||
|
|
@ -317,7 +317,7 @@ pipeline {
|
|||
DISTRO_CODE = "rhel84"
|
||||
}
|
||||
steps {
|
||||
run_tests('image')
|
||||
run_tests('image', 'hybrid')
|
||||
}
|
||||
post {
|
||||
always {
|
||||
|
|
@ -337,7 +337,7 @@ pipeline {
|
|||
AWS_IMAGE_TEST_CREDS = credentials('aws-credentials-osbuild-image-test')
|
||||
}
|
||||
steps {
|
||||
run_tests('integration')
|
||||
run_tests('integration', 'hybrid')
|
||||
}
|
||||
post {
|
||||
always {
|
||||
|
|
@ -348,7 +348,7 @@ pipeline {
|
|||
stage('EL8.4 OSTree') {
|
||||
agent { label "rhel84cloudbase && psi && x86_64" }
|
||||
steps {
|
||||
run_tests('ostree')
|
||||
run_tests('ostree', 'hybrid')
|
||||
}
|
||||
post {
|
||||
always {
|
||||
|
|
@ -385,7 +385,7 @@ pipeline {
|
|||
|
||||
// Set up a function to hold the steps needed to run the tests so we don't
|
||||
// need to copy/paste the same lines over and over above.
|
||||
void run_tests(test_type) {
|
||||
void run_tests(test_type, boot_type) {
|
||||
|
||||
// Get CI machine details.
|
||||
sh (
|
||||
|
|
@ -428,12 +428,20 @@ void run_tests(test_type) {
|
|||
script: "/usr/libexec/tests/osbuild-composer/koji.sh"
|
||||
)
|
||||
|
||||
// Run the qcow2 test.
|
||||
// Run the qcow2 BIOS boot test.
|
||||
sh (
|
||||
label: "Integration test: QCOW2",
|
||||
label: "Integration test: QCOW2, BIOS boot",
|
||||
script: "/usr/libexec/tests/osbuild-composer/qemu.sh qcow2"
|
||||
)
|
||||
|
||||
if (boot_type == 'hybrid') {
|
||||
// Run the qcow2 UEFI boot test.
|
||||
sh (
|
||||
label: "Integration test: QCOW2, UEFI boot",
|
||||
script: "/usr/libexec/tests/osbuild-composer/qemu.sh qcow2 uefi"
|
||||
)
|
||||
}
|
||||
|
||||
// Run the openstack test.
|
||||
sh (
|
||||
label: "Integration test: OpenStack",
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue