lib/utils.pm

@@ -1267,13 +1267,11 @@ sub check_prerelease {
 
 sub check_version {
     # This function checks if the correct version is display during installation
-    # in Anaconda, i.e. nonlive media showing Rawhide when Rawhide and version numbers
-    # when not Rawhide, while live media always showing version numbers.
+    # in Anaconda, it only looks at the major version, as these needles should
+    # not change between the major versions.
 
     my $version = lc(get_var('VERSION'));
-    if ($version eq 'rawhide' && get_var('LIVE')) {
-        $version = get_var('RAWREL');
-    }
+    $version =~ s/\..+$//;
     assert_screen "version_${version}_ident";
 }
 

needles/anaconda/main_hub/arabic/rocky-boot_to_anaconda-version_8_ident_arabic-20210822.json

@@ -12,6 +12,6 @@
   "tags": [
     "ENV-DISTRI-rocky",
     "LANGUAGE-arabic",
-    "version_8.4_ident"
+    "version_8_ident"
   ]
 }

needles/anaconda/main_hub/french/rocky-boot_to_anaconda-version_8_ident_french-20210822.json

@@ -12,6 +12,6 @@
   "tags": [
     "ENV-DISTRI-rocky",
     "LANGUAGE-french",
-    "version_8.4_ident"
+    "version_8_ident"
   ]
 }

needles/anaconda/main_hub/japanese/rocky-boot_to_anaconda-version_8_ident_japanese-20210822.json

@@ -12,6 +12,6 @@
   "tags": [
     "ENV-DISTRI-rocky",
     "LANGUAGE-japanese",
-    "version_8.4_ident"
+    "version_8_ident"
   ]
 }

needles/anaconda/main_hub/rocky-boot_to_anaconda-version_8.4_ident-20210805.json

@@ -1,16 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 777,
-      "ypos": 12,
-      "width": 231,
-      "height": 20,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "ENV-DISTRI-rocky",
-    "version_8.4_ident"
-  ]
-}

needles/anaconda/main_hub/rocky-boot_to_anaconda-version_8_ident-20210805.json

@@ -13,4 +13,4 @@
     "ENV-DISTRI-rocky",
     "version_8_ident"
   ]
-}
+}

needles/anaconda/main_hub/russian/rocky-boot_to_anaconda-version_8_ident_russian-20210822.json

@@ -12,6 +12,6 @@
   "tags": [
     "ENV-DISTRI-rocky",
     "LANGUAGE-russian",
-    "version_8.4_ident"
+    "version_8_ident"
   ]
 }