srbala/os-autoinst-distri-fedora
1
0
Fork 0
mirror of https://pagure.io/fedora-qa/os-autoinst-distri-fedora.git synced 2024-11-21 13:33:08 +00:00
Code Issues Releases Activity

Run base tests on ELN

Browse Source 
This requires a change in the package we use for base_update_cli
because pandoc-common is not in ELN.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2023-06-20 13:06:36 +02:00
parent bc8601a1d4
commit 0a87a76ff9
3 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/packagetest.pm
View File

@ -9,15 +9,15 @@ use testapi;
our @EXPORT = qw/prepare_test_packages verify_installed_packages verify_updated_packages/;
# enable the openqa test package repositories and install the main
# test packages, remove pandoc-common and install the fake one
# test packages, remove acpica-tools and install the fake one
sub prepare_test_packages {
# remove pandoc-common if installed (we don't use assert
# remove acpica-tools if installed (we don't use assert
# here in case it's not)
script_run 'dnf -y remove pandoc-common', 180;
script_run 'dnf -y remove acpica-tools', 180;
# grab the test repo definitions
assert_script_run 'curl -o /etc/yum.repos.d/openqa-testrepo-1.repo https://fedorapeople.org/groups/qa/openqa-repos/openqa-testrepo-1.repo';
# install the test packages from repo1
assert_script_run 'dnf -y --disablerepo=* --enablerepo=openqa-testrepo-1 install pandoc-common';
assert_script_run 'dnf -y --disablerepo=* --enablerepo=openqa-testrepo-1 install acpica-tools';
if (get_var("DESKTOP") eq 'kde' && get_var("TEST") eq 'desktop_update_graphical') {
# kick pkcon so our special update will definitely get installed
assert_script_run 'pkcon refresh force';
@ -27,15 +27,15 @@ sub prepare_test_packages {
# check our test packages installed correctly (this is a test that dnf
# actually does what it claims)
sub verify_installed_packages {
validate_script_output 'rpm -q pandoc-common', sub { $_ =~ m/^pandoc-common-1.1.noarch$/ };
assert_script_run 'rpm -V pandoc-common';
validate_script_output 'rpm -q acpica-tools', sub { $_ =~ m/^acpica-tools-1.1.noarch$/ };
assert_script_run 'rpm -V acpica-tools';
}
# check updating the test packages and the fake pandoc-common work
# check updating the test packages and the fake acpica-tools work
# as expected
sub verify_updated_packages {
# we don't know what version of pandoc-common we'll actually
# we don't know what version of acpica-tools we'll actually
# get, so just check it's *not* the fake one
validate_script_output 'rpm -q pandoc-common', sub { $_ !~ m/^pandoc-common-1-1.noarch$/ };
assert_script_run 'rpm -V pandoc-common';
validate_script_output 'rpm -q acpica-tools', sub { $_ !~ m/^acpica-tools-1-1.noarch$/ };
assert_script_run 'rpm -V acpica-tools';
}

7
templates.fif.json
View File

@ -627,6 +627,7 @@
},
"base_reboot_unmount": {
"profiles": {
"fedora-BaseOS-dvd-iso-x86_64-*-uefi": 50,
"fedora-Cloud_Base-qcow2-qcow2-aarch64-*-aarch64": 20,
"fedora-Cloud_Base-qcow2-qcow2-ppc64le-*-ppc64le": 20,
"fedora-Cloud_Base-qcow2-qcow2-x86_64-*-64bit": 20,
@ -659,6 +660,7 @@
},
"base_system_logging": {
"profiles": {
"fedora-BaseOS-dvd-iso-x86_64-*-uefi": 50,
"fedora-Cloud_Base-qcow2-qcow2-aarch64-*-aarch64": 20,
"fedora-Cloud_Base-qcow2-qcow2-ppc64le-*-ppc64le": 20,
"fedora-Cloud_Base-qcow2-qcow2-x86_64-*-uefi": 20,
@ -690,6 +692,7 @@
},
"base_update_cli": {
"profiles": {
"fedora-BaseOS-dvd-iso-x86_64-*-uefi": 50,
"fedora-Cloud_Base-qcow2-qcow2-aarch64-*-aarch64": 20,
"fedora-Cloud_Base-qcow2-qcow2-ppc64le-*-ppc64le": 20,
"fedora-Cloud_Base-qcow2-qcow2-x86_64-*-uefi": 20,
@ -716,6 +719,7 @@
},
"base_package_install_remove": {
"profiles": {
"fedora-BaseOS-dvd-iso-x86_64-*-uefi": 50,
"fedora-Cloud_Base-qcow2-qcow2-aarch64-*-aarch64": 40,
"fedora-Cloud_Base-qcow2-qcow2-ppc64le-*-ppc64le": 40,
"fedora-Cloud_Base-qcow2-qcow2-x86_64-*-uefi": 40,
@ -742,6 +746,7 @@
},
"base_services_start": {
"profiles": {
"fedora-BaseOS-dvd-iso-x86_64-*-uefi": 50,
"fedora-Cloud_Base-qcow2-qcow2-aarch64-*-aarch64": 40,
"fedora-Cloud_Base-qcow2-qcow2-ppc64le-*-ppc64le": 40,
"fedora-Cloud_Base-qcow2-qcow2-x86_64-*-64bit": 40,
@ -774,6 +779,7 @@
},
"base_selinux": {
"profiles": {
"fedora-BaseOS-dvd-iso-x86_64-*-uefi": 50,
"fedora-Cloud_Base-qcow2-qcow2-aarch64-*-aarch64": 40,
"fedora-Cloud_Base-qcow2-qcow2-ppc64le-*-ppc64le": 40,
"fedora-Cloud_Base-qcow2-qcow2-x86_64-*-uefi": 40,
@ -805,6 +811,7 @@
},
"base_service_manipulation": {
"profiles": {
"fedora-BaseOS-dvd-iso-x86_64-*-uefi": 50,
"fedora-Cloud_Base-qcow2-qcow2-aarch64-*-aarch64": 40,
"fedora-Cloud_Base-qcow2-qcow2-ppc64le-*-ppc64le": 40,
"fedora-Cloud_Base-qcow2-qcow2-x86_64-*-uefi": 40,

12
tests/base_update_cli.pm
View File

@ -11,16 +11,16 @@ sub run {
prepare_test_packages;
# check rpm agrees they installed good
verify_installed_packages;
# update the fake pandoc-common (should come from the real repo)
# update the fake acpica-tools (should come from the real repo)
# this can take a long time if we get unlucky with the metadata refresh
assert_script_run 'dnf -y --disablerepo=openqa-testrepo* --disablerepo=updates-testing update pandoc-common', 600;
assert_script_run 'dnf -y --disablerepo=openqa-testrepo* --disablerepo=updates-testing update acpica-tools', 600;
# check we got the updated version
verify_updated_packages;
# now remove pandoc-common, and see if we can do a straight
# now remove acpica-tools, and see if we can do a straight
# install from the default repos
assert_script_run 'dnf -y remove pandoc-common';
assert_script_run 'dnf -y --disablerepo=openqa-testrepo* --disablerepo=updates-testing install pandoc-common', 120;
assert_script_run 'rpm -V pandoc-common';
assert_script_run 'dnf -y remove acpica-tools';
assert_script_run 'dnf -y --disablerepo=openqa-testrepo* --disablerepo=updates-testing install acpica-tools', 120;
assert_script_run 'rpm -V acpica-tools';
}
sub test_flags {