sync main with develop #154
@ -60,13 +60,13 @@ sub get_release_number {
|
||||
my $version = get_var("VERSION");
|
||||
my $rawrel = get_var("RAWREL", "Rawhide");
|
||||
return $rawrel if ($version eq "Rawhide");
|
||||
return $version
|
||||
return $version;
|
||||
}
|
||||
|
||||
sub get_version_major {
|
||||
my $version = get_var('VERSION');
|
||||
my $version_major = substr($version, 0, index($version, q/./));
|
||||
return $version_major
|
||||
return $version_major;
|
||||
}
|
||||
|
||||
sub get_code_name {
|
||||
|
2
main.pm
2
main.pm
@ -85,7 +85,7 @@ sub cleanup_needles() {
|
||||
|
||||
# Unregister desktop needles of other desktops when DESKTOP is specified
|
||||
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_
|
||||
|
@ -11,7 +11,7 @@ sub run {
|
||||
# of mirrorlist.
|
||||
script_run 'printf "pub/rocky\n" > /etc/dnf/vars/contentdir';
|
||||
script_run 'dnf clean all';
|
||||
script_run 'dnf repoinfo'
|
||||
script_run 'dnf repoinfo';
|
||||
}
|
||||
|
||||
sub test_flags {
|
||||
|
@ -25,7 +25,7 @@ sub download_testdata {
|
||||
# Change ownership and attributes
|
||||
assert_script_run("chown -R test:test openqa_testdata");
|
||||
# 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 {
|
||||
|
@ -19,7 +19,7 @@ sub run {
|
||||
|
||||
# if testing the current release, rebase to devel
|
||||
unless (script_run "rpm-ostree status -b | grep stable") {
|
||||
$rebase = "devel"
|
||||
$rebase = "devel";
|
||||
}
|
||||
# rebase to the appropriate release, arch
|
||||
validate_script_output "rpm-ostree rebase fedora/${rebase}/${arch}/iot", sub { m/systemctl reboot/ }, 300;
|
||||
|
Loading…
Reference in New Issue
Block a user