Give _ostree_build lorax command a bit longer

It seems to be timing out a lot.

Signed-off-by: Adam Williamson <awilliam@redhat.com>

tests/_ostree_build.pm

@@ -89,7 +89,7 @@ sub run {
         $cmd .= " --isfinal --repo=/etc/yum.repos.d/fedora-updates.repo";
     }
     $cmd .= " --repo=/etc/yum.repos.d/advisory.repo --repo=/etc/yum.repos.d/workarounds.repo ./results";
-    assert_script_run $cmd, 6000;
+    assert_script_run $cmd, 7000;
     # good to have the log around for checks
     upload_logs "lorax.log", failok => 1;
     assert_script_run "mv results/images/boot.iso ./${advortask}-${subv}-ostree-${arch}.iso";

tests/rpmostree_rebase.pm

@@ -30,14 +30,8 @@ sub run {
         my $relnum = get_release_number;
         $rebase = $relnum - 1;
         # avoid rebasing from 37 to <37, bad stuff happens
-        # FIXME when
-        # https://github.com/fedora-silverblue/issue-tracker/issues/420
-        # is fixed we should change this to 38
+        # FIXME when 38 branches, we should change this to RELNUM+1
         $rebase = "rawhide" if ($relnum eq "37");
-        # FIXME: avoid rebasing to 38 until
-        # https://github.com/fedora-silverblue/issue-tracker/issues/420
-        # is fixed
-        $rebase = "37" if ($rebase eq "38");
         $target = "fedora/${rebase}/${arch}/silverblue";
     }
     elsif ($current =~ "coreos") {