From 30cbff08c9bf2204457cdb681c3fbc84866370d2 Mon Sep 17 00:00:00 2001
From: Al Bowles <akatch@users.noreply.github.com>
Date: Wed, 9 Feb 2022 20:05:34 -0600
Subject: [PATCH 1/6] Correctly check for default packagesets for each flavor

---
 tests/_software_selection.pm | 30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/tests/_software_selection.pm b/tests/_software_selection.pm
index a307ae34..06b968f4 100644
--- a/tests/_software_selection.pm
+++ b/tests/_software_selection.pm
@@ -7,25 +7,21 @@ sub run {
     # Anaconda hub
     assert_screen "anaconda_main_hub", 300; #
 
-    # Select package set. Minimal is the default, if 'default' is specified, skip selection,
-    # but verify correct default in some cases
-    my $packageset = get_var('PACKAGE_SET', 'minimal');
-    if ($packageset eq 'default' || get_var('MODULAR')) {
-        # we can't or don't want to check the selected package set in these cases
-        return if (get_var('CANNED') || get_var('LIVE') || get_var('MEMCHECK') || (get_var('DISTRI') eq 'Rocky'));
+    # Select package set. Default is 'graphical-server', unless FLAVOR=minimal, where default is 'server'.
+    # If 'default' is specified, skip selection, but verify correct default
+    my $packageset = get_var('PACKAGE_SET', 'graphical-server');
+    if ($packageset eq 'default') {
+        # if PACKAGE_SET=default, actually check for these:
+        # dvd-iso = graphical-server
+        # minimal-iso = server
+        # boot-iso = graphical-server
         $self->root_console;
-        my $env = 'custom-environment';
-        if (get_var('SUBVARIANT') eq 'Server') {
-            $env = 'server-product-environment';
+        my $env = "graphical-server-environment";
+        if ( get_var('FLAVOR') eq 'minimal-iso') {
+            $env = "server-environment";
         }
-        elsif (get_var('SUBVARIANT') eq 'Workstation') {
-            $env = 'workstation-product-environment';
-        }
-        # pre-F35 line looks like:
-        # 07:51:39,382 INF modules.payloads.payload.dnf.utils: selected environment: custom-environment
-        # F35+ line looks like:
-        # 07:40:26,614 DBG ui.lib.software: Selecting the 'custom-environment' environment.
-        assert_script_run "egrep '(selected env|Selecting the.*environment)' /tmp/anaconda.log /tmp/packaging.log | tail -1 | grep $env";
+
+        assert_script_run "egrep 'selected environment:' /tmp/anaconda.log /tmp/packaging.log | tail -1 | grep $env";
         send_key "ctrl-alt-f6";
         assert_screen "anaconda_main_hub", 30;
         return;
-- 
2.43.5


From ca11bc038c46c8d1d7f5bd0fe854b94e9c936bd0 Mon Sep 17 00:00:00 2001
From: Al Bowles <akatch@users.noreply.github.com>
Date: Wed, 9 Feb 2022 22:04:19 -0600
Subject: [PATCH 2/6] FIF updates for default packagesets

- Set DESKTOP=gnome to trigger graphical_wait_login instead of
  console_wait_login
- Increase virtual disk size to account for default packagesets
---
 templates.fif.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/templates.fif.json b/templates.fif.json
index b28c85aa..7849c78d 100644
--- a/templates.fif.json
+++ b/templates.fif.json
@@ -454,6 +454,8 @@
                 "rocky-dvd-iso-x86_64-*-uefi": 11
             },
             "settings": {
+                "DESKTOP": "gnome",
+                "HDDSIZEGB": "15",
                 "PACKAGE_SET": "default",
                 "POSTINSTALL": "_collect_data"
             }
-- 
2.43.5


From 82a8191c97f29774c7e1fc423e5da6cc1ad02448 Mon Sep 17 00:00:00 2001
From: Al Bowles <akatch@users.noreply.github.com>
Date: Tue, 15 Feb 2022 22:07:55 -0600
Subject: [PATCH 3/6] Correctly check for minimal-iso default packageset

---
 tests/_software_selection.pm | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/tests/_software_selection.pm b/tests/_software_selection.pm
index 06b968f4..5195c821 100644
--- a/tests/_software_selection.pm
+++ b/tests/_software_selection.pm
@@ -7,18 +7,14 @@ sub run {
     # Anaconda hub
     assert_screen "anaconda_main_hub", 300; #
 
-    # Select package set. Default is 'graphical-server', unless FLAVOR=minimal, where default is 'server'.
+    # Select package set.
     # If 'default' is specified, skip selection, but verify correct default
-    my $packageset = get_var('PACKAGE_SET', 'graphical-server');
+    my $packageset = get_var('PACKAGE_SET', 'default');
     if ($packageset eq 'default') {
-        # if PACKAGE_SET=default, actually check for these:
-        # dvd-iso = graphical-server
-        # minimal-iso = server
-        # boot-iso = graphical-server
         $self->root_console;
         my $env = "graphical-server-environment";
-        if ( get_var('FLAVOR') eq 'minimal-iso') {
-            $env = "server-environment";
+        if (get_var('FLAVOR') eq 'minimal-iso') {
+            $env = "server-product-environment";
         }
 
         assert_script_run "egrep 'selected environment:' /tmp/anaconda.log /tmp/packaging.log | tail -1 | grep $env";
@@ -38,18 +34,11 @@ sub run {
     # In Rocky, graphical-server starts out selected in the DVD ISO so if that's
     # what we're looking for we're done
     if (!check_screen("anaconda_".$packageset."_selected", 1)) {
-      # select desired environment
-      # go through the list 20 times at max (to prevent infinite loop when it's missing)
-      for (my $i = 0; !check_screen("anaconda_".$packageset."_highlighted", 1) && $i < 20; $i++) {
-        send_key "down";
-      }
-
+      send_key_until_needlematch("anaconda_".$packageset."_highlighted", "down", 20);
       send_key "spc";
     }
 
-    # check that desired environment is selected
     assert_screen "anaconda_".$packageset."_selected";
-
     assert_and_click "anaconda_spoke_done";
 
     # Anaconda hub
-- 
2.43.5


From a06d47f4a54bb86d0f62feff8d15f7a1101bfea1 Mon Sep 17 00:00:00 2001
From: Al Bowles <akatch@users.noreply.github.com>
Date: Sun, 6 Mar 2022 02:05:20 -0600
Subject: [PATCH 4/6] Updated needles for issue 16

---
 needles/rocky-next_button-20220216.json       |  17 +++++++++++
 needles/rocky-next_button-20220216.png        | Bin 0 -> 24366 bytes
 ...ocky-root_logged_in_biosfont-20220306.json |  27 ++++++++++++++++++
 ...rocky-root_logged_in_biosfont-20220306.png | Bin 0 -> 1317 bytes
 4 files changed, 44 insertions(+)
 create mode 100644 needles/rocky-next_button-20220216.json
 create mode 100644 needles/rocky-next_button-20220216.png
 create mode 100644 needles/rocky-root_logged_in_biosfont-20220306.json
 create mode 100644 needles/rocky-root_logged_in_biosfont-20220306.png

diff --git a/needles/rocky-next_button-20220216.json b/needles/rocky-next_button-20220216.json
new file mode 100644
index 00000000..48dcdf53
--- /dev/null
+++ b/needles/rocky-next_button-20220216.json
@@ -0,0 +1,17 @@
+{
+  "area": [
+    {
+      "width": 55,
+      "type": "match",
+      "height": 25,
+      "ypos": 37,
+      "xpos": 958
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "LANGUAGE-english",
+    "next_button"
+  ]
+}
\ No newline at end of file
diff --git a/needles/rocky-next_button-20220216.png b/needles/rocky-next_button-20220216.png
new file mode 100644
index 0000000000000000000000000000000000000000..0b77698c7aba20f0445aea9820fe20f0eae03758
GIT binary patch
literal 24366
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

literal 0
HcmV?d00001

diff --git a/needles/rocky-root_logged_in_biosfont-20220306.json b/needles/rocky-root_logged_in_biosfont-20220306.json
new file mode 100644
index 00000000..5fef6fe9
--- /dev/null
+++ b/needles/rocky-root_logged_in_biosfont-20220306.json
@@ -0,0 +1,27 @@
+{
+  "area": [
+    {
+      "height": 14,
+      "type": "match",
+      "width": 41,
+      "xpos": 7,
+      "ypos": 128,
+      "match": 93
+    },
+    {
+      "ypos": 128,
+      "xpos": 104,
+      "type": "match",
+      "width": 16,
+      "height": 14,
+      "match": 93
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "ENV-FLAVOR-server",
+    "root_console",
+    "root_logged_in"
+  ]
+}
\ No newline at end of file
diff --git a/needles/rocky-root_logged_in_biosfont-20220306.png b/needles/rocky-root_logged_in_biosfont-20220306.png
new file mode 100644
index 0000000000000000000000000000000000000000..026b5326c46f5b0d94b7b5c6d6bc470814f952ad
GIT binary patch
literal 1317
zcmchV{XY{39LHy?3E^Jq5?zgZ<vb-N_Odk@wS*oP+nr6JW+V@FYNCxT953sMn3ZsB
zipJT4vq{M5OrDBt_S)oDVX|2dTR2;B>;8zozr4TS&*%GkeSY|Ui_k|ytSuca0RVt?
z=%E7<0Kghk3j&ydOrTvXJZb_MeHeo>k;CC^AW-K`D~iwqL6}U1R>4iv;2jG-+JEn`
zCdWx3<DuiPQ+AKje!Iq|9WyGL%)EVU1VTF9#tq@5b9hxZ7LW*)A0Z?eK69Y><BbTN
z^0M3x0O)33DyhCFE3T8U?w4+#X*msvSpG!wScrh!ioZ_x2u<gn38sgveY*+0Lb5`$
z7mTGKpGK)jKkXM+xhHYCELB#mdTx7&%ri8M)ksi8gaW(mhyA__dJy<#y<ZJup-#u%
z8O}(CL{5W%YN~k~q|ZYJy?=Y#hFwvspUFr)5AaLl!74DUsiE`ajQaLz&hL-6bj5d3
zWG|#_M#<Tgj}<t^ok{-Qaa}R{_1JjfRDy;U2y@9v^1dbE9IwL@OX--f)Uzc5tWj9B
z;@dVm7iFoH;`2I0_`!%M_H@jbmBq$D>vvm6=HhY3sz{e#j74`h@X1!0fo)3pu36ar
zydFU{*wfK(fOk;N76-vJzDn>?hK>*Sb&p6SMS27~hp1W3-tC9ev61KU9+~fG-C2t|
zRmH6DrL$NrO|GrNj;C0h$>HYmxrBy?&ADQFOs9Btjc>XXW0KG1Q*Af<?epo*CN&hD
zU!Oj;jvJf4{ynJRxkYBbtfH!`cj?;C%U)APyYP7C!1?>Sy8?9-X)DE<+G$)Ki#A=q
zJ6rpwRg$Z=+GQ>)Tg2F?*{cXuwBGvkvdj1+u{SMyGTW^Ni+dkl7SldF;kmunaD!fF
z_d?s;gXOwuG<_<&!UfPu2yMV{<?;HFlfX*mczw9qr>@eK`0P$eI@uw3u45XKWidm6
zqrxi228Q4wdt$=yU?1>A&k_E>sK8t<)i6%M!h~1tnZ?O_@?Ege!a_%s(43lLv4dcd
zh{LE^`Ut=F#T%$uH>`S+IfE!4iD(hCh!6H9f6C+>myi)&kP~YO7RQK~2kd7A>01R{
zoQ%{6ug&uF#c=6nmrmO=0o7uoxvz+Zo>JMH?Z3_vPkk5#Ku+Jb8L!1()l5Knf7ceI
zKq!mO({QN<%6ppe$FJ)qq=mNc)*71w-bEUjlHvzL74mxpX{$fZEWND1pmf*lepH6J
zfKKR&7u_79^na<}=1$G_uB8suw#(tKWJ`82uo55u@OgFUyL?GkK%0n6LE<1=I>2St
zz%;!XKeQW?l@wXhmtix!{MXel%7=(c7M=(c<Hq6>W_OnRs1m5&WJV}j+%$4-<4BVk
z{|L=il<Fig=Ghw`!vc%dK94*)Rj#q~tK-Cf^A1OwSNgl>;AExG6Ua(~zp|YC+RF)Q
z<xhmqrnS&gQjGp7LQBKEu|<<%-jj27qQ&S1s!+}6(6zvM;vh{%P!)4SZ2D>2Qw5$E
zWw0wJ4_y!iAxkj2%XwW6P|FXbn7C3JO#g;djvN*Qb&u{09LMFRmLppSZ<5O6?$ZAG
zU(f<oU#HX>k?j;boY!ynHb!sAM}|#itloVy92>jO^l;z4D6m!VPn3&w9_VTO*Yr@-
L(F4uFak>8iK@(k?

literal 0
HcmV?d00001

-- 
2.43.5


From cc35f53dee3a3ac85905149bda0bb08dd477d876 Mon Sep 17 00:00:00 2001
From: Al Bowles <akatch@users.noreply.github.com>
Date: Sun, 6 Mar 2022 02:06:13 -0600
Subject: [PATCH 5/6] Update templates.fif.json with package set test suites

Package sets tested per ISO will follow these conventions:
- Test suites will not be duplicated between the boot and dvd ISOs
- All default package sets will be tested against dvd-iso
- Boot ISO will be considered valid if `minimal` package set installs
  cleanly
---
 templates.fif.json           | 27 +++++++++++++++++----------
 tests/_software_selection.pm |  1 +
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/templates.fif.json b/templates.fif.json
index 7849c78d..437071e2 100644
--- a/templates.fif.json
+++ b/templates.fif.json
@@ -618,17 +618,13 @@
         },
         "install_package_set_minimal": {
             "profiles": {
+                "rocky-boot-iso-x86_64-*-64bit": 10,
+                "rocky-boot-iso-x86_64-*-uefi": 11,
+                "rocky-dvd-iso-x86_64-*-64bit": 11,
+                "rocky-dvd-iso-x86_64-*-uefi": 11,
+                "rocky-minimal-iso-x86_64-*-64bit": 10,
                 "rocky-universal-aarch64-*-aarch64": 30,
-                "rocky-universal-x86_64-*-64bit": 30
-            },
-            "settings": {
-                "PACKAGE_SET": "minimal",
-                "POSTINSTALL": "_console_login"
-            }
-        },
-        "install_package_set_minimal": {
-            "profiles": {
-                "rocky-universal-aarch64-*-aarch64": 30,
+                "rocky-universal-x86_64-*-64bit": 30,
                 "rocky-package-set-x86_64-*-64bit": 30
             },
             "settings": {
@@ -638,6 +634,9 @@
         },
         "install_package_set_server": {
             "profiles": {
+                "rocky-dvd-iso-x86_64-*-64bit": 11,
+                "rocky-dvd-iso-x86_64-*-uefi": 11,
+                "rocky-minimal-iso-x86_64-*-64bit": 10,
                 "rocky-universal-aarch64-*-aarch64": 30,
                 "rocky-package-set-x86_64-*-64bit": 30
             },
@@ -648,12 +647,15 @@
         },
         "install_package_set_graphical-server": {
             "profiles": {
+                "rocky-dvd-iso-x86_64-*-64bit": 11,
+                "rocky-dvd-iso-x86_64-*-uefi": 11,
                 "rocky-universal-aarch64-*-aarch64": 30,
                 "rocky-package-set-x86_64-*-64bit": 30
             },
             "settings": {
                 "DESKTOP": "gnome",
                 "ENCRYPT_PASSWORD": "weakpassword",
+                "HDDSIZEGB": "15",
                 "PACKAGE_SET": "graphical-server",
                 "POSTINSTALL": "_console_login",
                 "ROOT_PASSWORD": "weakpassword",
@@ -662,12 +664,15 @@
         },
         "install_package_set_workstation": {
             "profiles": {
+                "rocky-dvd-iso-x86_64-*-64bit": 11,
+                "rocky-dvd-iso-x86_64-*-uefi": 11,
                 "rocky-universal-aarch64-*-aarch64": 30,
                 "rocky-package-set-x86_64-*-64bit": 30
             },
             "settings": {
                 "DESKTOP": "gnome",
                 "ENCRYPT_PASSWORD": "weakpassword",
+                "HDDSIZEGB": "15",
                 "PACKAGE_SET": "workstation",
                 "POSTINSTALL": "_console_login",
                 "ROOT_PASSWORD": "weakpassword",
@@ -676,6 +681,8 @@
         },
         "install_package_set_virtualization-host": {
             "profiles": {
+                "rocky-dvd-iso-x86_64-*-64bit": 11,
+                "rocky-dvd-iso-x86_64-*-uefi": 11,
                 "rocky-universal-aarch64-*-aarch64": 30,
                 "rocky-package-set-x86_64-*-64bit": 30
             },
diff --git a/tests/_software_selection.pm b/tests/_software_selection.pm
index 5195c821..abb08d88 100644
--- a/tests/_software_selection.pm
+++ b/tests/_software_selection.pm
@@ -38,6 +38,7 @@ sub run {
       send_key "spc";
     }
 
+    # check that desired environment is selected
     assert_screen "anaconda_".$packageset."_selected";
     assert_and_click "anaconda_spoke_done";
 
-- 
2.43.5


From 81c5d647902676b75d23aa06c77c452dcb166187 Mon Sep 17 00:00:00 2001
From: Al Bowles <akatch@users.noreply.github.com>
Date: Mon, 21 Mar 2022 20:44:46 -0500
Subject: [PATCH 6/6] Do not add updated needle with changed hostname

---
 ...ocky-root_logged_in_biosfont-20220306.json |  27 ------------------
 ...rocky-root_logged_in_biosfont-20220306.png | Bin 1317 -> 0 bytes
 2 files changed, 27 deletions(-)
 delete mode 100644 needles/rocky-root_logged_in_biosfont-20220306.json
 delete mode 100644 needles/rocky-root_logged_in_biosfont-20220306.png

diff --git a/needles/rocky-root_logged_in_biosfont-20220306.json b/needles/rocky-root_logged_in_biosfont-20220306.json
deleted file mode 100644
index 5fef6fe9..00000000
--- a/needles/rocky-root_logged_in_biosfont-20220306.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "area": [
-    {
-      "height": 14,
-      "type": "match",
-      "width": 41,
-      "xpos": 7,
-      "ypos": 128,
-      "match": 93
-    },
-    {
-      "ypos": 128,
-      "xpos": 104,
-      "type": "match",
-      "width": 16,
-      "height": 14,
-      "match": 93
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "ENV-DISTRI-rocky",
-    "ENV-FLAVOR-server",
-    "root_console",
-    "root_logged_in"
-  ]
-}
\ No newline at end of file
diff --git a/needles/rocky-root_logged_in_biosfont-20220306.png b/needles/rocky-root_logged_in_biosfont-20220306.png
deleted file mode 100644
index 026b5326c46f5b0d94b7b5c6d6bc470814f952ad..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1317
zcmchV{XY{39LHy?3E^Jq5?zgZ<vb-N_Odk@wS*oP+nr6JW+V@FYNCxT953sMn3ZsB
zipJT4vq{M5OrDBt_S)oDVX|2dTR2;B>;8zozr4TS&*%GkeSY|Ui_k|ytSuca0RVt?
z=%E7<0Kghk3j&ydOrTvXJZb_MeHeo>k;CC^AW-K`D~iwqL6}U1R>4iv;2jG-+JEn`
zCdWx3<DuiPQ+AKje!Iq|9WyGL%)EVU1VTF9#tq@5b9hxZ7LW*)A0Z?eK69Y><BbTN
z^0M3x0O)33DyhCFE3T8U?w4+#X*msvSpG!wScrh!ioZ_x2u<gn38sgveY*+0Lb5`$
z7mTGKpGK)jKkXM+xhHYCELB#mdTx7&%ri8M)ksi8gaW(mhyA__dJy<#y<ZJup-#u%
z8O}(CL{5W%YN~k~q|ZYJy?=Y#hFwvspUFr)5AaLl!74DUsiE`ajQaLz&hL-6bj5d3
zWG|#_M#<Tgj}<t^ok{-Qaa}R{_1JjfRDy;U2y@9v^1dbE9IwL@OX--f)Uzc5tWj9B
z;@dVm7iFoH;`2I0_`!%M_H@jbmBq$D>vvm6=HhY3sz{e#j74`h@X1!0fo)3pu36ar
zydFU{*wfK(fOk;N76-vJzDn>?hK>*Sb&p6SMS27~hp1W3-tC9ev61KU9+~fG-C2t|
zRmH6DrL$NrO|GrNj;C0h$>HYmxrBy?&ADQFOs9Btjc>XXW0KG1Q*Af<?epo*CN&hD
zU!Oj;jvJf4{ynJRxkYBbtfH!`cj?;C%U)APyYP7C!1?>Sy8?9-X)DE<+G$)Ki#A=q
zJ6rpwRg$Z=+GQ>)Tg2F?*{cXuwBGvkvdj1+u{SMyGTW^Ni+dkl7SldF;kmunaD!fF
z_d?s;gXOwuG<_<&!UfPu2yMV{<?;HFlfX*mczw9qr>@eK`0P$eI@uw3u45XKWidm6
zqrxi228Q4wdt$=yU?1>A&k_E>sK8t<)i6%M!h~1tnZ?O_@?Ege!a_%s(43lLv4dcd
zh{LE^`Ut=F#T%$uH>`S+IfE!4iD(hCh!6H9f6C+>myi)&kP~YO7RQK~2kd7A>01R{
zoQ%{6ug&uF#c=6nmrmO=0o7uoxvz+Zo>JMH?Z3_vPkk5#Ku+Jb8L!1()l5Knf7ceI
zKq!mO({QN<%6ppe$FJ)qq=mNc)*71w-bEUjlHvzL74mxpX{$fZEWND1pmf*lepH6J
zfKKR&7u_79^na<}=1$G_uB8suw#(tKWJ`82uo55u@OgFUyL?GkK%0n6LE<1=I>2St
zz%;!XKeQW?l@wXhmtix!{MXel%7=(c7M=(c<Hq6>W_OnRs1m5&WJV}j+%$4-<4BVk
z{|L=il<Fig=Ghw`!vc%dK94*)Rj#q~tK-Cf^A1OwSNgl>;AExG6Ua(~zp|YC+RF)Q
z<xhmqrnS&gQjGp7LQBKEu|<<%-jj27qQ&S1s!+}6(6zvM;vh{%P!)4SZ2D>2Qw5$E
zWw0wJ4_y!iAxkj2%XwW6P|FXbn7C3JO#g;djvN*Qb&u{09LMFRmLppSZ<5O6?$ZAG
zU(f<oU#HX>k?j;boY!ynHb!sAM}|#itloVy92>jO^l;z4D6m!VPn3&w9_VTO*Yr@-
L(F4uFak>8iK@(k?

-- 
2.43.5