srbala/os-autoinst-distri-fedora
1
0
Fork 0
mirror of https://pagure.io/fedora-qa/os-autoinst-distri-fedora.git synced 2024-11-24 14:53:09 +00:00
Code Issues Releases Activity

Use 'ge' and 'lt' for Rawhide version checks, not 'eq'

Browse Source 
This *should* make things easier at branching, where we might
want not to tell fedfind/openQA about the new Rawhide release
number until there's a compose, but we still want tests of
Rawhide updates to go down the Rawhide paths.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2024-08-13 15:32:17 -04:00
parent 234f103c44
commit cf2acf034d
6 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/utils.pm
View File

@ -697,7 +697,7 @@ sub _repo_setup_updates {
disable_updates_repos(both => 0) if ($version > $currrel); disable_updates_repos(both => 0) if ($version > $currrel);
# use the buildroot repo on Rawhide: see e.g. # use the buildroot repo on Rawhide: see e.g.
# https://pagure.io/fedora-ci/general/issue/376 for why # https://pagure.io/fedora-ci/general/issue/376 for why
if (get_var("VERSION") eq get_var("RAWREL") && get_var("TEST") ne "support_server") { if (get_var("VERSION") ge get_var("RAWREL") && get_var("TEST") ne "support_server") {
assert_script_run 'printf "[koji-rawhide]\nname=koji-rawhide\nbaseurl=https://kojipkgs.fedoraproject.org/repos/rawhide/latest/' . $arch . '/\ncost=2000\nenabled=1\ngpgcheck=0\n" > /etc/yum.repos.d/koji-rawhide.repo'; assert_script_run 'printf "[koji-rawhide]\nname=koji-rawhide\nbaseurl=https://kojipkgs.fedoraproject.org/repos/rawhide/latest/' . $arch . '/\ncost=2000\nenabled=1\ngpgcheck=0\n" > /etc/yum.repos.d/koji-rawhide.repo';
} }
if (get_var("CANNED")) { if (get_var("CANNED")) {

2
tests/_container_build_kiwi.pm
View File

@ -19,7 +19,7 @@ sub run {
my $repoxml; my $repoxml;
my $releasever; my $releasever;
my $mockver; my $mockver;
if ($version eq $rawrel) { if ($version ge $rawrel) {
$branch = "main"; $branch = "main";
$repoxml = "repositories/core-rawhide.xml"; $repoxml = "repositories/core-rawhide.xml";
$releasever = "Rawhide"; $releasever = "Rawhide";

4
tests/_installer_build.pm
View File

@ -8,7 +8,7 @@ sub run {
my $version = get_var("VERSION"); my $version = get_var("VERSION");
my $currrel = get_var("CURRREL"); my $currrel = get_var("CURRREL");
my $rawrel = get_var("RAWREL"); my $rawrel = get_var("RAWREL");
my $repo = $version eq $rawrel ? "fedora-rawhide.repo" : "fedora.repo"; my $repo = $version ge $rawrel ? "fedora-rawhide.repo" : "fedora.repo";
my $advortask = get_var("ADVISORY_OR_TASK"); my $advortask = get_var("ADVISORY_OR_TASK");
my $arch = get_var("ARCH"); my $arch = get_var("ARCH");
# python3-dnf is for updvercheck.py # python3-dnf is for updvercheck.py
@ -27,7 +27,7 @@ sub run {
$cmd .= " --isfinal --repo=/etc/yum.repos.d/fedora-updates.repo"; $cmd .= " --isfinal --repo=/etc/yum.repos.d/fedora-updates.repo";
} }
$cmd .= " --repo=/etc/yum.repos.d/workarounds.repo" if (get_workarounds); $cmd .= " --repo=/etc/yum.repos.d/workarounds.repo" if (get_workarounds);
$cmd .= " --repo=/etc/yum.repos.d/koji-rawhide.repo" if ($version eq $rawrel); $cmd .= " --repo=/etc/yum.repos.d/koji-rawhide.repo" if ($version ge $rawrel);
$cmd .= " --repo=/etc/yum.repos.d/advisory.repo" unless (get_var("TAG") || get_var("COPR")); $cmd .= " --repo=/etc/yum.repos.d/advisory.repo" unless (get_var("TAG") || get_var("COPR"));
$cmd .= " --repo=/etc/yum.repos.d/openqa-testtag.repo" if (get_var("TAG") || get_var("COPR")); $cmd .= " --repo=/etc/yum.repos.d/openqa-testtag.repo" if (get_var("TAG") || get_var("COPR"));
$cmd .= " ./results"; $cmd .= " ./results";

6
tests/_live_build.pm
View File

@ -11,7 +11,7 @@ sub run {
my $repoks; my $repoks;
my $releasever; my $releasever;
my $mockver; my $mockver;
if ($version eq $rawrel) { if ($version ge $rawrel) {
$branch = "main"; $branch = "main";
$repoks = "fedora-repo-rawhide.ks"; $repoks = "fedora-repo-rawhide.ks";
$releasever = "Rawhide"; $releasever = "Rawhide";
@ -56,7 +56,7 @@ sub run {
# and the workaround repo # and the workaround repo
$repos .= '\n[workarounds]\nname=Workarounds repo\nbaseurl=file:///mnt/workarounds_repo\nenabled=1\nmetadata_expire=3600\ngpgcheck=0\n' if ($workarounds); $repos .= '\n[workarounds]\nname=Workarounds repo\nbaseurl=file:///mnt/workarounds_repo\nenabled=1\nmetadata_expire=3600\ngpgcheck=0\n' if ($workarounds);
# also the buildroot repo, for Rawhide # also the buildroot repo, for Rawhide
if ($version eq $rawrel) { if ($version ge $rawrel) {
$repos .= '\n[koji-rawhide]\nname=Buildroot repo\nbaseurl=https://kojipkgs.fedoraproject.org/repos/f' . $version . '-build/latest/\$basearch/\nenabled=1\nmetadata_expire=3600\ngpgcheck=0\nskip_if_unavailable=1\n'; $repos .= '\n[koji-rawhide]\nname=Buildroot repo\nbaseurl=https://kojipkgs.fedoraproject.org/repos/f' . $version . '-build/latest/\$basearch/\nenabled=1\nmetadata_expire=3600\ngpgcheck=0\nskip_if_unavailable=1\n';
} }
$repos .= '\"\"\"'; $repos .= '\"\"\"';
@ -75,7 +75,7 @@ sub run {
# and the workarounds repo # and the workarounds repo
assert_script_run 'echo "repo --name=workarounds --baseurl=file:///mnt/workarounds_repo" >> ' . $repoks if ($workarounds); assert_script_run 'echo "repo --name=workarounds --baseurl=file:///mnt/workarounds_repo" >> ' . $repoks if ($workarounds);
# and the buildroot repo, for Rawhide # and the buildroot repo, for Rawhide
if ($version eq $rawrel) { if ($version ge $rawrel) {
assert_script_run 'echo "repo --name=koji-rawhide --baseurl=https://kojipkgs.fedoraproject.org/repos/f' . $version . '-build/latest/\$basearch/" >> ' . $repoks; assert_script_run 'echo "repo --name=koji-rawhide --baseurl=https://kojipkgs.fedoraproject.org/repos/f' . $version . '-build/latest/\$basearch/" >> ' . $repoks;
} }
# now flatten the kickstart # now flatten the kickstart

10
tests/_ostree_build.pm
View File

@ -8,9 +8,9 @@ sub run {
my $version = get_var("VERSION"); my $version = get_var("VERSION");
my $currrel = get_var("CURRREL"); my $currrel = get_var("CURRREL");
my $rawrel = get_var("RAWREL"); my $rawrel = get_var("RAWREL");
my $repo = $version eq $rawrel ? "fedora-rawhide.repo" : "fedora.repo"; my $repo = $version ge $rawrel ? "fedora-rawhide.repo" : "fedora.repo";
my $branch; my $branch;
if ($version eq $rawrel) { if ($version ge $rawrel) {
$branch = "main"; $branch = "main";
} }
else { else {
@ -40,13 +40,13 @@ sub run {
assert_script_run "git checkout ${branch}"; assert_script_run "git checkout ${branch}";
# now copy the advisory, workaround repo and koji-rawhide config files # now copy the advisory, workaround repo and koji-rawhide config files
assert_script_run 'cp /etc/yum.repos.d/workarounds.repo .' if ($workarounds); assert_script_run 'cp /etc/yum.repos.d/workarounds.repo .' if ($workarounds);
assert_script_run 'cp /etc/yum.repos.d/koji-rawhide.repo .' if ($version eq $rawrel); assert_script_run 'cp /etc/yum.repos.d/koji-rawhide.repo .' if ($version ge $rawrel);
assert_script_run 'cp /etc/yum.repos.d/advisory.repo .' unless ($tag || $copr); assert_script_run 'cp /etc/yum.repos.d/advisory.repo .' unless ($tag || $copr);
assert_script_run 'cp /etc/yum.repos.d/openqa-testtag.repo .' if ($tag || $copr); assert_script_run 'cp /etc/yum.repos.d/openqa-testtag.repo .' if ($tag || $copr);
# and add them to the config file # and add them to the config file
my $repl = 'repos:'; my $repl = 'repos:';
$repl .= '\n - workarounds' if ($workarounds); $repl .= '\n - workarounds' if ($workarounds);
$repl .= '\n - koji-rawhide' if ($version eq $rawrel); $repl .= '\n - koji-rawhide' if ($version ge $rawrel);
$repl .= '\n - advisory' unless ($tag || $copr); $repl .= '\n - advisory' unless ($tag || $copr);
$repl .= '\n - openqa-testtag' if ($tag || $copr); $repl .= '\n - openqa-testtag' if ($tag || $copr);
# Just add them to all config files, as the names change a lot # Just add them to all config files, as the names change a lot
@ -98,7 +98,7 @@ sub run {
$cmd .= " --isfinal --repo=/etc/yum.repos.d/fedora-updates.repo"; $cmd .= " --isfinal --repo=/etc/yum.repos.d/fedora-updates.repo";
} }
$cmd .= " --repo=/etc/yum.repos.d/workarounds.repo" if ($workarounds); $cmd .= " --repo=/etc/yum.repos.d/workarounds.repo" if ($workarounds);
$cmd .= " --repo=/etc/yum.repos.d/koji-rawhide.repo" if ($version eq $rawrel); $cmd .= " --repo=/etc/yum.repos.d/koji-rawhide.repo" if ($version ge $rawrel);
$cmd .= " --repo=/etc/yum.repos.d/advisory.repo" unless ($tag || $copr); $cmd .= " --repo=/etc/yum.repos.d/advisory.repo" unless ($tag || $copr);
$cmd .= " --repo=/etc/yum.repos.d/openqa-testtag.repo" if ($tag || $copr); $cmd .= " --repo=/etc/yum.repos.d/openqa-testtag.repo" if ($tag || $copr);
$cmd .= " ./results"; $cmd .= " ./results";

2
tests/desktop_background.pm
View File

@ -11,7 +11,7 @@ sub run {
# don't have any requirement for what background Rawhide uses. # don't have any requirement for what background Rawhide uses.
my $version = get_var('VERSION'); my $version = get_var('VERSION');
my $rawrel = get_var('RAWREL'); my $rawrel = get_var('RAWREL');
return unless ($version ne "Rawhide" && $version ne $rawrel); return unless ($version ne "Rawhide" && $version lt $rawrel);
# KDE shows a different version of the welcome center on major upgrades, # KDE shows a different version of the welcome center on major upgrades,
# which breaks this test # which breaks this test
click_lastmatch if (get_var("DESKTOP") eq "kde" && get_var("ADVISORY_OR_TASK") && check_screen "kde_ok", 5); click_lastmatch if (get_var("DESKTOP") eq "kde" && get_var("ADVISORY_OR_TASK") && check_screen "kde_ok", 5);