From 02136a80e1241fb9a142d1fde894aae2b47ef7ab Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Dec 13 2022 22:34:34 +0000
Subject: utils.pm: drop some stuff unneeded after F35 EOL


and associated needles.

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

---

diff --git a/lib/utils.pm b/lib/utils.pm
index a8d4c00..e887f05 100644
--- a/lib/utils.pm
+++ b/lib/utils.pm
@@ -477,7 +477,6 @@ sub setup_workaround_repo {
     assert_script_run "mkdir -p /mnt/workarounds_repo";
     assert_script_run "pushd /mnt/workarounds_repo";
     my %workarounds = (
-        "35" => [],
         "36" => [],
         "37" => [],
         "38" => [],
@@ -921,11 +920,6 @@ sub anaconda_create_user {
         wait_still_screen 2;
         _type_user_password();
     }
-    # FIXME: this is selected by default from F36 (20210118.n.0) on.
-    # we can drop this block and associated needles entirely on F35 EOL
-    unless (check_screen "anaconda_install_user_creation_admin_selected") {
-        assert_and_click "anaconda_install_user_creation_make_admin";
-    }
     assert_and_click "anaconda_spoke_done";
     # since 20170105, we will get a warning here when the password
     # contains non-ASCII characters. Assume only switched layouts
diff --git a/needles/anaconda/install_process/arabic/user_creation_admin_selected_arabic-untranslated-20220118.json b/needles/anaconda/install_process/arabic/user_creation_admin_selected_arabic-untranslated-20220118.json
deleted file mode 100644
index 4c70644..0000000
--- a/needles/anaconda/install_process/arabic/user_creation_admin_selected_arabic-untranslated-20220118.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "area": [
-    {
-      "type": "match",
-      "height": 21,
-      "ypos": 188,
-      "xpos": 500,
-      "width": 185
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "LANGUAGE-arabic",
-    "anaconda_install_user_creation_admin_selected"
-  ]
-}
\ No newline at end of file
diff --git a/needles/anaconda/install_process/arabic/user_creation_admin_selected_arabic-untranslated-20220118.png b/needles/anaconda/install_process/arabic/user_creation_admin_selected_arabic-untranslated-20220118.png
deleted file mode 100644
index 534d0a4..0000000
Binary files a/needles/anaconda/install_process/arabic/user_creation_admin_selected_arabic-untranslated-20220118.png and /dev/null differ
diff --git a/needles/anaconda/install_process/arabic/user_creation_make_admin_arabic-untranslated-gtk3245-20190206.json b/needles/anaconda/install_process/arabic/user_creation_make_admin_arabic-untranslated-gtk3245-20190206.json
deleted file mode 100644
index f49b2f9..0000000
--- a/needles/anaconda/install_process/arabic/user_creation_make_admin_arabic-untranslated-gtk3245-20190206.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "area": [
-    {
-      "ypos": 214,
-      "type": "match",
-      "xpos": 566,
-      "height": 21,
-      "width": 106
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "LANGUAGE-arabic",
-    "anaconda_install_user_creation_make_admin"
-  ]
-}
\ No newline at end of file
diff --git a/needles/anaconda/install_process/arabic/user_creation_make_admin_arabic-untranslated-gtk3245-20190206.png b/needles/anaconda/install_process/arabic/user_creation_make_admin_arabic-untranslated-gtk3245-20190206.png
deleted file mode 100644
index eb493a9..0000000
Binary files a/needles/anaconda/install_process/arabic/user_creation_make_admin_arabic-untranslated-gtk3245-20190206.png and /dev/null differ
diff --git a/needles/anaconda/install_process/french/user_creation_admin_selected_french-20220504.json b/needles/anaconda/install_process/french/user_creation_admin_selected_french-20220504.json
deleted file mode 100644
index 889d208..0000000
--- a/needles/anaconda/install_process/french/user_creation_admin_selected_french-20220504.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 354,
-      "height": 21,
-      "ypos": 187,
-      "width": 156,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "LANGUAGE-french",
-    "anaconda_install_user_creation_admin_selected"
-  ]
-}
\ No newline at end of file
diff --git a/needles/anaconda/install_process/french/user_creation_admin_selected_french-20220504.png b/needles/anaconda/install_process/french/user_creation_admin_selected_french-20220504.png
deleted file mode 100644
index 7ee803a..0000000
Binary files a/needles/anaconda/install_process/french/user_creation_admin_selected_french-20220504.png and /dev/null differ
diff --git a/needles/anaconda/install_process/french/user_creation_admin_selected_french-untranslated-20220118.json b/needles/anaconda/install_process/french/user_creation_admin_selected_french-untranslated-20220118.json
deleted file mode 100644
index 4935e0f..0000000
--- a/needles/anaconda/install_process/french/user_creation_admin_selected_french-untranslated-20220118.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "area": [
-    {
-      "width": 194,
-      "height": 21,
-      "ypos": 187,
-      "xpos": 344,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "LANGUAGE-french",
-    "anaconda_install_user_creation_admin_selected"
-  ]
-}
diff --git a/needles/anaconda/install_process/french/user_creation_admin_selected_french-untranslated-20220118.png b/needles/anaconda/install_process/french/user_creation_admin_selected_french-untranslated-20220118.png
deleted file mode 100644
index 211124f..0000000
Binary files a/needles/anaconda/install_process/french/user_creation_admin_selected_french-untranslated-20220118.png and /dev/null differ
diff --git a/needles/anaconda/install_process/french/user_creation_make_admin_french-20191129.json b/needles/anaconda/install_process/french/user_creation_make_admin_french-20191129.json
deleted file mode 100644
index 9916603..0000000
--- a/needles/anaconda/install_process/french/user_creation_make_admin_french-20191129.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "area": [
-    {
-      "type": "match",
-      "xpos": 343,
-      "height": 21,
-      "width": 264,
-      "ypos": 213
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "ENV-DISTRI-fedora",
-    "LANGUAGE-french",
-    "anaconda_install_user_creation_make_admin"
-  ]
-}
\ No newline at end of file
diff --git a/needles/anaconda/install_process/french/user_creation_make_admin_french-20191129.png b/needles/anaconda/install_process/french/user_creation_make_admin_french-20191129.png
deleted file mode 100644
index 612c072..0000000
Binary files a/needles/anaconda/install_process/french/user_creation_make_admin_french-20191129.png and /dev/null differ
diff --git a/needles/anaconda/install_process/japanese/user_creation_admin_selected_japanese-20220420.json b/needles/anaconda/install_process/japanese/user_creation_admin_selected_japanese-20220420.json
deleted file mode 100644
index b5dacc4..0000000
--- a/needles/anaconda/install_process/japanese/user_creation_admin_selected_japanese-20220420.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "area": [
-    {
-      "height": 21,
-      "width": 152,
-      "ypos": 195,
-      "type": "match",
-      "xpos": 360
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "LANGUAGE-japanese",
-    "anaconda_install_user_creation_admin_selected"
-  ]
-}
\ No newline at end of file
diff --git a/needles/anaconda/install_process/japanese/user_creation_admin_selected_japanese-20220420.png b/needles/anaconda/install_process/japanese/user_creation_admin_selected_japanese-20220420.png
deleted file mode 100644
index 31f0d31..0000000
Binary files a/needles/anaconda/install_process/japanese/user_creation_admin_selected_japanese-20220420.png and /dev/null differ
diff --git a/needles/anaconda/install_process/japanese/user_creation_admin_selected_japanese-untranslated-20220118.json b/needles/anaconda/install_process/japanese/user_creation_admin_selected_japanese-untranslated-20220118.json
deleted file mode 100644
index 72f7885..0000000
--- a/needles/anaconda/install_process/japanese/user_creation_admin_selected_japanese-untranslated-20220118.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "area": [
-    {
-      "width": 194,
-      "height": 21,
-      "ypos": 187,
-      "xpos": 344,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "LANGUAGE-japanese",
-    "anaconda_install_user_creation_admin_selected"
-  ]
-}
diff --git a/needles/anaconda/install_process/japanese/user_creation_admin_selected_japanese-untranslated-20220118.png b/needles/anaconda/install_process/japanese/user_creation_admin_selected_japanese-untranslated-20220118.png
deleted file mode 100644
index 211124f..0000000
Binary files a/needles/anaconda/install_process/japanese/user_creation_admin_selected_japanese-untranslated-20220118.png and /dev/null differ
diff --git a/needles/anaconda/install_process/japanese/user_creation_make_admin_japanese-20190429.json b/needles/anaconda/install_process/japanese/user_creation_make_admin_japanese-20190429.json
deleted file mode 100644
index 9e375cd..0000000
--- a/needles/anaconda/install_process/japanese/user_creation_make_admin_japanese-20190429.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "area": [
-    {
-      "width": 188,
-      "height": 17,
-      "type": "match",
-      "ypos": 226,
-      "xpos": 384
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "LANGUAGE-japanese",
-    "anaconda_install_user_creation_make_admin"
-  ]
-}
\ No newline at end of file
diff --git a/needles/anaconda/install_process/japanese/user_creation_make_admin_japanese-20190429.png b/needles/anaconda/install_process/japanese/user_creation_make_admin_japanese-20190429.png
deleted file mode 100644
index 2beffa8..0000000
Binary files a/needles/anaconda/install_process/japanese/user_creation_make_admin_japanese-20190429.png and /dev/null differ
diff --git a/needles/anaconda/install_process/russian/user_creation_admin_selected_russian-20220118.json b/needles/anaconda/install_process/russian/user_creation_admin_selected_russian-20220118.json
deleted file mode 100644
index 59edeae..0000000
--- a/needles/anaconda/install_process/russian/user_creation_admin_selected_russian-20220118.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "area": [
-    {
-      "width": 283,
-      "type": "match",
-      "ypos": 187,
-      "xpos": 248,
-      "height": 21
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "LANGUAGE-russian",
-    "anaconda_install_user_creation_admin_selected"
-  ]
-}
\ No newline at end of file
diff --git a/needles/anaconda/install_process/russian/user_creation_admin_selected_russian-20220118.png b/needles/anaconda/install_process/russian/user_creation_admin_selected_russian-20220118.png
deleted file mode 100644
index 539e30a..0000000
Binary files a/needles/anaconda/install_process/russian/user_creation_admin_selected_russian-20220118.png and /dev/null differ
diff --git a/needles/anaconda/install_process/russian/user_creation_make_admin_russian-20200118.json b/needles/anaconda/install_process/russian/user_creation_make_admin_russian-20200118.json
deleted file mode 100644
index efcf377..0000000
--- a/needles/anaconda/install_process/russian/user_creation_make_admin_russian-20200118.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "area": [
-    {
-      "type": "match",
-      "height": 21,
-      "ypos": 212,
-      "width": 326,
-      "xpos": 354
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "LANGUAGE-russian",
-    "anaconda_install_user_creation_make_admin"
-  ]
-}
\ No newline at end of file
diff --git a/needles/anaconda/install_process/russian/user_creation_make_admin_russian-20200118.png b/needles/anaconda/install_process/russian/user_creation_make_admin_russian-20200118.png
deleted file mode 100644
index 7599b0d..0000000
Binary files a/needles/anaconda/install_process/russian/user_creation_make_admin_russian-20200118.png and /dev/null differ
diff --git a/needles/anaconda/install_process/user_creation_admin_selected-20220118.json b/needles/anaconda/install_process/user_creation_admin_selected-20220118.json
deleted file mode 100644
index fdcc238..0000000
--- a/needles/anaconda/install_process/user_creation_admin_selected-20220118.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "area": [
-    {
-      "width": 194,
-      "height": 21,
-      "ypos": 187,
-      "xpos": 344,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "LANGUAGE-english",
-    "anaconda_install_user_creation_admin_selected"
-  ]
-}
diff --git a/needles/anaconda/install_process/user_creation_admin_selected-20220118.png b/needles/anaconda/install_process/user_creation_admin_selected-20220118.png
deleted file mode 100644
index 211124f..0000000
Binary files a/needles/anaconda/install_process/user_creation_admin_selected-20220118.png and /dev/null differ
diff --git a/needles/anaconda/install_process/user_creation_make_admin-20200116.json b/needles/anaconda/install_process/user_creation_make_admin-20200116.json
deleted file mode 100644
index 335f312..0000000
--- a/needles/anaconda/install_process/user_creation_make_admin-20200116.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "area": [
-    {
-      "type": "match",
-      "height": 21,
-      "ypos": 212,
-      "width": 194,
-      "xpos": 360
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "ENV-DISTRI-fedora",
-    "LANGUAGE-english",
-    "anaconda_install_user_creation_make_admin"
-  ]
-}
\ No newline at end of file
diff --git a/needles/anaconda/install_process/user_creation_make_admin-20200116.png b/needles/anaconda/install_process/user_creation_make_admin-20200116.png
deleted file mode 100644
index e3b854b..0000000
Binary files a/needles/anaconda/install_process/user_creation_make_admin-20200116.png and /dev/null differ