lib/utils.pm

@@ -479,8 +479,7 @@ sub setup_workaround_repo {
     my %workarounds = (
         "36" => [],
         "37" => [],
-        "38" => ["FEDORA-2023-0b2abc9ee6"],
+        "38" => ["FEDORA-2023-240cd5ee29", "FEDORA-2023-adf2c08800", "FEDORA-2023-5ad9752e38"],
-        "39" => ["FEDORA-2023-eaa25ada50"],
     );
     # then we'll download each update for our release:
     my $advortasks = $workarounds{$version};

needles/anaconda/identification/arabic/prerelease_note-arabic-20230214.json

@@ -1,16 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 98,
-      "type": "match",
-      "ypos": 41,
-      "width": 108,
-      "height": 18
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "LANGUAGE-arabic",
-    "prerelease_note"
-  ]
-}

needles/anaconda/identification/version_37-kde-20230214.json

@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 813,
-      "type": "match",
-      "ypos": 13,
-      "width": 84,
-      "height": 18
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "version_37_ident"
-  ]
-}

needles/anaconda/identification/version_39-20230210.json

@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 787,
-      "ypos": 15,
-      "width": 84,
-      "height": 16,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "version_39_ident"
-  ]
-}

needles/anaconda/identification/version_39-kde-20230210.json

@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "height": 16,
-      "width": 84,
-      "type": "match",
-      "ypos": 15,
-      "xpos": 807
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "version_39_ident"
-  ]
-}

needles/anaconda/install_process/user_creation_screen-kde-20230214.json

@@ -1,32 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 253,
-      "type": "match",
-      "width": 69,
-      "ypos": 135,
-      "height": 17
-    },
-    {
-      "width": 62,
-      "ypos": 235,
-      "height": 17,
-      "type": "match",
-      "xpos": 262
-    },
-    {
-      "type": "match",
-      "xpos": 10,
-      "height": 24,
-      "width": 38,
-      "ypos": 30
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "anaconda_install_user_creation_screen",
-    "ENV-DISTRI-fedora",
-    "LANGUAGE-english",
-    "ENV-FLAVOR-server"
-  ]
-}

needles/background/38_background-beta-1309.json

@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 584,
-      "ypos": 367,
-      "width": 186,
-      "height": 104,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "38_background"
-  ]
-}

needles/console/live_overlay_warning-20230216.json

@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 204,
-      "ypos": 32,
-      "width": 168,
-      "height": 16,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "live_overlay_warning"
-  ]
-}

needles/gnome/login_gdm_input-20230215.json

@@ -1,17 +0,0 @@
-{
-  "area": [
-    {
-      "ypos": 457,
-      "width": 56,
-      "height": 45,
-      "type": "match",
-      "xpos": 391
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "graphical_login_input",
-    "DESKTOP-gnome",
-    "LANGUAGE-english"
-  ]
-}

tests/_boot_to_anaconda.pm

@@ -111,12 +111,8 @@ sub run {
             }
         }
         else {
-            if (get_var('LIVE')) {
-                if (check_screen "live_overlay_warning", 45) {
-                    record_soft_failure "Got a persistent overlay warning - https://bugzilla.redhat.com/show_bug.cgi?id=2170544";
-                    send_key "ret";
-                }
             # on lives, we have to explicitly launch anaconda
+            if (get_var('LIVE')) {
                 my $count = 5;
                 while ($count > 0) {
                     $count -= 1;

tests/_ostree_build.pm

@@ -74,6 +74,7 @@ sub run {
     assert_script_run 'git clone https://pagure.io/pungi-fedora.git';
     assert_script_run 'cd pungi-fedora/';
     assert_script_run "git checkout ${branch}";
+    # change 'ostree' to 'main' on/after merge
     assert_script_run 'wget https://pagure.io/fedora-qa/os-autoinst-distri-fedora/raw/main/f/ostree-parse-pungi.py', timeout => 120;
     my $loraxargs = script_output "python3 ostree-parse-pungi.py $lcsubv $arch";
 

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
+        # FIXME when 38 branches, we should change this to RELNUM+1
-        # https://github.com/fedora-silverblue/issue-tracker/issues/420
-        # is fixed we should change this to 38
         $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") {