remove ENV-DESKTOP- tag, set DESKTOP- tag instead where necessary

Let's use the same principle with DESKTOP tag as we use with
LANGUAGE tag. Where there are any GNOME-only (or KDE-only) needles, tag
them with `DESKTOP-gnome` and delete then when different `DESKTOP` value
is specified. This will help with `QA:Testcase_Package_Sets_KDE_Package_Install`
testcase - we will be able to use almost the same code and check that KDE
got installed properly.

Differential Revision: https://phab.qadevel.cloud.fedoraproject.org/D670

main.pm

@@ -77,6 +77,11 @@ sub cleanup_needles() {
         unregister_needle_tags("INSTALLER-smallhub");
     }
 
+    # Unregister desktop needles of other desktops when DESKTOP is specified
+    if (get_var('DESKTOP')) {
+        unregister_prefix_tags('DESKTOP', [ get_var('DESKTOP') ])
+    }
+
     # Unregister non-language-appropriate needles. See unregister_except_
     # tags for details; basically all needles with at least one LANGUAGE-
     # tag will be unregistered unless they match the current langauge.

needles/anaconda_install_done-freetype262.json

@@ -2,7 +2,6 @@
   "properties": [],
   "tags": [
     "anaconda_install_done",
-    "ENV-DESKTOP-default",
     "ENV-DISTRI-fedora",
     "LANGUAGE-english"
   ],
@@ -22,4 +21,4 @@
       "type": "match"
     }
   ]
-}
+}

needles/anaconda_install_done.json

@@ -17,7 +17,6 @@
     ],
     "tags": [
         "anaconda_install_done",
-        "ENV-DESKTOP-default",
         "ENV-DISTRI-fedora",
         "LANGUAGE-english"
     ]

needles/anaconda_install_done_french-freetype262.json

@@ -2,7 +2,6 @@
   "properties": [],
   "tags": [
     "anaconda_install_done",
-    "ENV-DESKTOP-default",
     "ENV-DISTRI-fedora",
     "LANGUAGE-french"
   ],
@@ -22,4 +21,4 @@
       "type": "match"
     }
   ]
-}
+}

needles/anaconda_install_done_french.json

@@ -17,8 +17,7 @@
     ],
     "tags": [
         "anaconda_install_done",
-        "ENV-DESKTOP-default",
         "ENV-DISTRI-fedora",
         "LANGUAGE-french"
     ]
-}
+}

needles/anaconda_install_root_password.json

@@ -10,7 +10,6 @@
     ],
     "tags": [
         "anaconda_install_root_password",
-        "ENV-DESKTOP-default",
         "ENV-DISTRI-fedora"
     ]
 }

needles/anaconda_install_user_creation.json

@@ -9,7 +9,6 @@
         }
     ],
     "tags": [
-        "ENV-DESKTOP-default",
         "ENV-DISTRI-fedora",
         "anaconda_install_user_creation"
     ]

needles/anaconda_install_user_creation_make_admin-freetype262.json

@@ -1,7 +1,6 @@
 {
   "properties": [],
   "tags": [
-    "ENV-DESKTOP-default",
     "ENV-DISTRI-fedora",
     "LANGUAGE-english",
     "anaconda_install_user_creation_make_admin"
@@ -15,4 +14,4 @@
       "type": "match"
     }
   ]
-}
+}

needles/anaconda_install_user_creation_make_admin.json

@@ -9,9 +9,8 @@
         }
     ],
     "tags": [
-        "ENV-DESKTOP-default",
         "ENV-DISTRI-fedora",
         "LANGUAGE-english",
         "anaconda_install_user_creation_make_admin"
     ]
-}
+}

needles/anaconda_install_user_creation_make_admin_french-freetype262.json

@@ -10,9 +10,8 @@
   ],
   "properties": [],
   "tags": [
-    "ENV-DESKTOP-default",
     "ENV-DISTRI-fedora",
     "LANGUAGE-french",
     "anaconda_install_user_creation_make_admin"
   ]
-}
+}

needles/anaconda_install_user_creation_make_admin_french.json

@@ -9,7 +9,6 @@
         }
     ],
     "tags": [
-        "ENV-DESKTOP-default",
         "ENV-DISTRI-fedora",
         "LANGUAGE-french",
         "anaconda_install_user_creation_make_admin"

needles/anaconda_main_hub_begin_installation-cantarell17.json

@@ -1,7 +1,6 @@
 {
   "tags": [
     "anaconda_main_hub_begin_installation",
-    "ENV-DESKTOP-default",
     "ENV-DISTRI-fedora",
     "LANGUAGE-english"
   ],
@@ -15,4 +14,4 @@
     }
   ],
   "properties": []
-}
+}

needles/anaconda_main_hub_begin_installation-freetype262.json

@@ -1,7 +1,6 @@
 {
   "tags": [
     "anaconda_main_hub_begin_installation",
-    "ENV-DESKTOP-default",
     "ENV-DISTRI-fedora",
     "LANGUAGE-english"
   ],
@@ -15,4 +14,4 @@
       "ypos": 703
     }
   ]
-}
+}

needles/anaconda_main_hub_begin_installation.json

@@ -10,8 +10,7 @@
     ],
     "tags": [
         "anaconda_main_hub_begin_installation",
-        "ENV-DESKTOP-default",
         "ENV-DISTRI-fedora",
         "LANGUAGE-english"
     ]
-}
+}

needles/anaconda_main_hub_begin_installation_french-freetype262.json

@@ -11,8 +11,7 @@
   "properties": [],
   "tags": [
     "anaconda_main_hub_begin_installation",
-    "ENV-DESKTOP-default",
     "ENV-DISTRI-fedora",
     "LANGUAGE-french"
   ]
-}
+}

needles/anaconda_main_hub_begin_installation_french.json

@@ -10,7 +10,6 @@
     ],
     "tags": [
         "anaconda_main_hub_begin_installation",
-        "ENV-DESKTOP-default",
         "ENV-DISTRI-fedora",
         "LANGUAGE-french"
     ]

needles/anaconda_main_hub_install_destination.json

@@ -10,7 +10,6 @@
     ],
     "tags": [
         "anaconda_main_hub_install_destination",
-        "ENV-DESKTOP-default",
         "ENV-DISTRI-fedora"
     ]
 }

needles/anaconda_select_install_lang_continue-cantarell17.json

@@ -2,7 +2,6 @@
   "properties": [],
   "tags": [
     "anaconda_select_install_lang_continue",
-    "ENV-DESKTOP-default",
     "ENV-DISTRI-fedora",
     "LANGUAGE-english"
   ],
@@ -15,4 +14,4 @@
       "ypos": 734
     }
   ]
-}
+}

needles/anaconda_select_install_lang_continue-freetype262.json

@@ -1,7 +1,6 @@
 {
   "tags": [
     "anaconda_select_install_lang_continue",
-    "ENV-DESKTOP-default",
     "ENV-DISTRI-fedora",
     "LANGUAGE-english"
   ],
@@ -15,4 +14,4 @@
       "width": 88
     }
   ]
-}
+}

needles/anaconda_select_install_lang_continue.json

@@ -10,8 +10,7 @@
     ],
     "tags": [
         "anaconda_select_install_lang_continue",
-        "ENV-DESKTOP-default",
         "ENV-DISTRI-fedora",
         "LANGUAGE-english"
     ]
-}
+}

needles/anaconda_select_install_lang_continue_french-cantarell17.json

@@ -9,7 +9,6 @@
   ],
   "tags": [
     "anaconda_select_install_lang_continue",
-    "ENV-DESKTOP-default",
     "ENV-DISTRI-fedora",
     "LANGUAGE-french"
   ],

needles/anaconda_select_install_lang_continue_french.json

@@ -10,7 +10,6 @@
     ],
     "tags": [
         "anaconda_select_install_lang_continue",
-        "ENV-DESKTOP-default",
         "ENV-DISTRI-fedora",
         "LANGUAGE-french"
     ]

needles/anaconda_select_install_lang_english_filtered-cantarell18.json

@@ -18,8 +18,7 @@
   "properties": [],
   "tags": [
     "anaconda_select_install_lang_filtered",
-    "ENV-DESKTOP-default",
     "ENV-DISTRI-fedora",
     "LANGUAGE-english"
   ]
-}
+}

needles/anaconda_select_install_lang_english_filtered.json

@@ -17,7 +17,6 @@
     ],
     "tags": [
         "anaconda_select_install_lang_filtered",
-        "ENV-DESKTOP-default",
         "ENV-DISTRI-fedora",
         "LANGUAGE-english"
     ]

needles/anaconda_select_install_lang_french_filtered-cantarell17.json

@@ -18,8 +18,7 @@
   ],
   "tags": [
     "anaconda_select_install_lang_filtered",
-    "ENV-DESKTOP-default",
     "ENV-DISTRI-fedora",
     "LANGUAGE-french"
   ]
-}
+}

needles/anaconda_select_install_lang_french_filtered-cantarell18.json

@@ -18,8 +18,7 @@
     "properties": [],
     "tags": [
         "anaconda_select_install_lang_filtered",
-        "ENV-DESKTOP-default",
         "ENV-DISTRI-fedora",
         "LANGUAGE-french"
     ]
-}
+}

needles/anaconda_select_install_lang_french_filtered-freetype262.json

@@ -17,9 +17,8 @@
   ],
   "tags": [
     "anaconda_select_install_lang_filtered",
-    "ENV-DESKTOP-default",
     "ENV-DISTRI-fedora",
     "LANGUAGE-french"
   ],
   "properties": []
-}
+}

needles/anaconda_select_install_lang_french_filtered.json

@@ -17,7 +17,6 @@
   ],
   "tags": [
     "anaconda_select_install_lang_filtered",
-    "ENV-DESKTOP-default",
     "ENV-DISTRI-fedora",
     "LANGUAGE-french"
   ]

needles/anaconda_spoke_done-freetype262.json

@@ -10,9 +10,8 @@
   ],
   "tags": [
     "anaconda_spoke_done",
-    "ENV-DESKTOP-default",
     "ENV-DISTRI-fedora",
     "LANGUAGE-english"
   ],
   "properties": []
-}
+}

needles/anaconda_spoke_done.json

@@ -10,7 +10,6 @@
     ],
     "tags": [
         "anaconda_spoke_done",
-        "ENV-DESKTOP-default",
         "ENV-DISTRI-fedora",
         "LANGUAGE-english"
     ]

needles/anaconda_spoke_done_french-freetype262.json

@@ -2,7 +2,6 @@
   "properties": [],
   "tags": [
     "anaconda_spoke_done",
-    "ENV-DESKTOP-default",
     "ENV-DISTRI-fedora",
     "LANGUAGE-french"
   ],
@@ -15,4 +14,4 @@
       "type": "match"
     }
   ]
-}
+}

needles/anaconda_spoke_done_french.json

@@ -10,8 +10,7 @@
     ],
     "tags": [
         "anaconda_spoke_done",
-        "ENV-DESKTOP-default",
         "ENV-DISTRI-fedora",
         "LANGUAGE-french"
     ]
-}
+}

needles/anaconda_spoke_done_lighter.json

@@ -11,8 +11,7 @@
   ],
   "tags": [
     "anaconda_spoke_done",
-    "ENV-DESKTOP-default",
     "ENV-DISTRI-fedora",
     "LANGUAGE-english"
   ]
-}
+}

needles/anaconda_spoke_done_olddpi.json

@@ -10,8 +10,7 @@
     ],
     "tags": [
         "anaconda_spoke_done",
-        "ENV-DESKTOP-default",
         "ENV-DISTRI-fedora",
         "LANGUAGE-english"
     ]
-}
+}

needles/bootloader_uefi.json

@@ -1,6 +1,5 @@
 {
   "tags": [
-    "ENV-DESKTOP-gnome",
     "ENV-DISTRI-fedora",
     "ENV-FLAVOR-server_boot",
     "ENV-FLAVOR-workstation_live",

needles/gnome_desktop_clean-cantarell18.json

@@ -16,10 +16,10 @@
     }
   ],
   "tags": [
-    "ENV-DESKTOP-gnome",
+    "DESKTOP-gnome",
     "ENV-DISTRI-fedora",
     "LANGUAGE-english",
     "graphical_desktop_clean"
   ],
   "properties": []
-}
+}

needles/gnome_desktop_clean-freetype262.json

@@ -17,9 +17,9 @@
   ],
   "properties": [],
   "tags": [
-    "ENV-DESKTOP-gnome",
+    "DESKTOP-gnome",
     "ENV-DISTRI-fedora",
     "LANGUAGE-english",
     "graphical_desktop_clean"
   ]
-}
+}

needles/gnome_desktop_clean.json

@@ -1,6 +1,6 @@
 {
   "tags": [
-    "ENV-DESKTOP-gnome",
+    "DESKTOP-gnome",
     "ENV-DISTRI-fedora",
     "LANGUAGE-english",
     "graphical_desktop_clean"

needles/gnome_desktop_runner-cantarell17.json

@@ -10,8 +10,8 @@
     }
   ],
   "tags": [
-    "ENV-DESKTOP-gnome",
+    "DESKTOP-gnome",
     "ENV-FLAVOR-workstation_live",
     "desktop_runner"
   ]
-}
+}

needles/gnome_desktop_runner.json

@@ -10,7 +10,7 @@
   ],
   "properties": [],
   "tags": [
-    "ENV-DESKTOP-gnome",
+    "DESKTOP-gnome",
     "ENV-FLAVOR-workstation_live",
     "desktop_runner"
   ]

needles/graphical_login_gdm.json

@@ -1,6 +1,7 @@
 {
   "tags": [
     "graphical_login",
+    "DESKTOP-gnome",
     "ENV-DISTRI-fedora",
     "LANGUAGE-english",
     "ENV-FLAVOR-develop"

needles/graphical_login_gdm_input.json

@@ -11,8 +11,9 @@
     "properties": [],
     "tags": [
         "graphical_login_input",
+        "DESKTOP-gnome",
         "ENV-DISTRI-fedora",
         "LANGUAGE-english",
         "ENV-FLAVOR-develop"
     ]
-}
+}

needles/graphical_login_sddm.json

@@ -1,7 +1,7 @@
 {
   "tags": [
     "graphical_login",
-    "ENV-DESKTOP-kde",
+    "DESKTOP-kde",
     "LANGUAGE-english",
     "ENV-FLAVOR-kde_live"
   ],

needles/kde_desktop_runner.json

@@ -10,7 +10,7 @@
   ],
   "tags": [
     "desktop_runner",
-    "ENV-DESKTOP-kde",
+    "DESKTOP-kde",
     "ENV-FLAVOR-kde_live"
   ],
   "properties": []

needles/kde_desktop_runner2.json

@@ -10,9 +10,9 @@
     }
   ],
   "tags": [
-    "ENV-DESKTOP-kde",
+    "DESKTOP-kde",
     "ENV-DISTRI-fedora",
     "ENV-FLAVOR-kde_live",
     "desktop_runner"
   ]
-}
+}

needles/kde_live_anaconda_icon.json

@@ -1,7 +1,7 @@
 {
   "tags": [
     "live_start_anaconda_icon",
-    "ENV-DESKTOP-kde",
+    "DESKTOP-kde",
     "ENV-DISTRI-fedora",
     "ENV-FLAVOR-kde_live"
   ],

needles/workstation_live_initial-20151204-lighter.json

@@ -13,6 +13,6 @@
     "live_initial_anaconda_launcher",
     "live_start_anaconda_icon",
     "ENV-DISTRI-fedora",
-    "ENV-DESKTOP-gnome"
+    "DESKTOP-gnome"
   ]
-}
+}

needles/workstation_live_initial.json

@@ -3,7 +3,7 @@
     "live_initial_anaconda_launcher",
     "live_start_anaconda_icon",
     "ENV-DISTRI-fedora",
-    "ENV-DESKTOP-gnome"
+    "DESKTOP-gnome"
   ],
   "area": [
     {

templates

@@ -1030,6 +1030,7 @@
                         { key => "BOOTFROM", value => "c" },
                         { key => "HDD_1", value => "disk_f22_desktop_x86_64.img" },
                         { key => "UPGRADE", value => "desktop" },
+                        { key => "DESKTOP", value => "gnome" },
                       ],
                       variables => "",
                     },
@@ -1052,6 +1053,7 @@
                         { key => "BOOTFROM", value => "c" },
                         { key => "HDD_1", value => "disk_f22_desktop_i686.img" },
                         { key => "UPGRADE", value => "desktop" },
+                        { key => "DESKTOP", value => "gnome" },
                       ],
                       variables => "",
                     },