testing/os-autoinst-distri-rocky-migrated
10
0
Fork 0
Code Issues 12 Pull Requests 1 Packages Projects Releases Wiki Activity

sync main with develop #154

Merged
tcooper merged 9 commits from develop into main 2023-02-23 16:09:51 +00:00
Conversation 0 Commits 9 Files Changed - +932 -932
237 changed files with 932 additions and 932 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 61d57d4591 - Show all commits

4
lib/utils.pm
View File

@ -60,13 +60,13 @@ sub get_release_number {
my $version = get_var("VERSION"); my $version = get_var("VERSION");
my $rawrel = get_var("RAWREL", "Rawhide"); my $rawrel = get_var("RAWREL", "Rawhide");
return $rawrel if ($version eq "Rawhide"); return $rawrel if ($version eq "Rawhide");
return $version return $version;
} }
sub get_version_major { sub get_version_major {
my $version = get_var('VERSION'); my $version = get_var('VERSION');
my $version_major = substr($version, 0, index($version, q/./)); my $version_major = substr($version, 0, index($version, q/./));
return $version_major return $version_major;
} }
sub get_code_name { sub get_code_name {

2
main.pm
View File

@ -85,7 +85,7 @@ sub cleanup_needles() {
# Unregister desktop needles of other desktops when DESKTOP is specified # Unregister desktop needles of other desktops when DESKTOP is specified
if (get_var('DESKTOP')) { if (get_var('DESKTOP')) {
unregister_prefix_tags('DESKTOP', [ get_var('DESKTOP') ]) unregister_prefix_tags('DESKTOP', [get_var('DESKTOP')]);
} }
# Unregister non-language-appropriate needles. See unregister_except_ # Unregister non-language-appropriate needles. See unregister_except_

2
tests/_staging_repos_disable.pm
View File

@ -11,7 +11,7 @@ sub run {
# of mirrorlist. # of mirrorlist.
script_run 'printf "pub/rocky\n" > /etc/dnf/vars/contentdir'; script_run 'printf "pub/rocky\n" > /etc/dnf/vars/contentdir';
script_run 'dnf clean all'; script_run 'dnf clean all';
script_run 'dnf repoinfo' script_run 'dnf repoinfo';
} }
sub test_flags { sub test_flags {

2
tests/applications/evince/aaa_setup.pm
View File

@ -25,7 +25,7 @@ sub download_testdata {
# Change ownership and attributes # Change ownership and attributes
assert_script_run("chown -R test:test openqa_testdata"); assert_script_run("chown -R test:test openqa_testdata");
# Move the test file into a correct location. # Move the test file into a correct location.
assert_script_run("cp openqa_testdata/evince/evince.pdf Documents") assert_script_run("cp openqa_testdata/evince/evince.pdf Documents");
} }
sub run { sub run {

2
tests/iot_rpmostree_rebase.pm
View File

@ -19,7 +19,7 @@ sub run {
# if testing the current release, rebase to devel # if testing the current release, rebase to devel
unless (script_run "rpm-ostree status -b | grep stable") { unless (script_run "rpm-ostree status -b | grep stable") {
$rebase = "devel" $rebase = "devel";
} }
# rebase to the appropriate release, arch # rebase to the appropriate release, arch
validate_script_output "rpm-ostree rebase fedora/${rebase}/${arch}/iot", sub { m/systemctl reboot/ }, 300; validate_script_output "rpm-ostree rebase fedora/${rebase}/${arch}/iot", sub { m/systemctl reboot/ }, 300;