From 0a87a76ff90e0cb565c11b12712896e2e0095a44 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 20 Jun 2023 13:06:36 +0200 Subject: [PATCH] Run base tests on ELN 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 --- lib/packagetest.pm | 20 ++++++++++---------- templates.fif.json | 7 +++++++ tests/base_update_cli.pm | 12 ++++++------ 3 files changed, 23 insertions(+), 16 deletions(-) diff --git a/lib/packagetest.pm b/lib/packagetest.pm index f5fce1e9..371d6ec2 100644 --- a/lib/packagetest.pm +++ b/lib/packagetest.pm @@ -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'; } diff --git a/templates.fif.json b/templates.fif.json index c8be6b34..fd73c80f 100644 --- a/templates.fif.json +++ b/templates.fif.json @@ -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, diff --git a/tests/base_update_cli.pm b/tests/base_update_cli.pm index b37599b7..2b433d50 100644 --- a/tests/base_update_cli.pm +++ b/tests/base_update_cli.pm @@ -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 {