testing
/
os-autoinst-distri-rocky
mirror of https://github.com/rocky-linux/os-autoinst-distri-rocky.git
11
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Jan Sedlák 2015-12-08 11:32:48 +01:00
parent 35c42da79b
commit 6e801bcd52
49 changed files with 48 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
main.pm
View File

@ -77,6 +77,11 @@ sub cleanup_needles() {
unregister_needle_tags("INSTALLER-smallhub"); 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_ # Unregister non-language-appropriate needles. See unregister_except_
# tags for details; basically all needles with at least one LANGUAGE- # tags for details; basically all needles with at least one LANGUAGE-
# tag will be unregistered unless they match the current langauge. # tag will be unregistered unless they match the current langauge.

3
needles/anaconda_install_done-freetype262.json
View File

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

1
needles/anaconda_install_done.json
View File

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

3
needles/anaconda_install_done_french-freetype262.json
View File

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

3
needles/anaconda_install_done_french.json
View File

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

1
needles/anaconda_install_root_password.json
View File

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

1
needles/anaconda_install_user_creation.json
View File

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

3
needles/anaconda_install_user_creation_make_admin-freetype262.json
View File

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

3
needles/anaconda_install_user_creation_make_admin.json
View File

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

3
needles/anaconda_install_user_creation_make_admin_french-freetype262.json
View File

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

1
needles/anaconda_install_user_creation_make_admin_french.json
View File

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

3
needles/anaconda_main_hub_begin_installation-cantarell17.json
View File

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

3
needles/anaconda_main_hub_begin_installation-freetype262.json
View File

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

3
needles/anaconda_main_hub_begin_installation.json
View File

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

3
needles/anaconda_main_hub_begin_installation_french-freetype262.json
View File

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

1
needles/anaconda_main_hub_begin_installation_french.json
View File

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

1
needles/anaconda_main_hub_install_destination.json
View File

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

3
needles/anaconda_select_install_lang_continue-cantarell17.json
View File

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

3
needles/anaconda_select_install_lang_continue-freetype262.json
View File

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

3
needles/anaconda_select_install_lang_continue.json
View File

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

1
needles/anaconda_select_install_lang_continue_french-cantarell17.json
View File

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

1
needles/anaconda_select_install_lang_continue_french.json
View File

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

3
needles/anaconda_select_install_lang_english_filtered-cantarell18.json
View File

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

1
needles/anaconda_select_install_lang_english_filtered.json
View File

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

3
needles/anaconda_select_install_lang_french_filtered-cantarell17.json
View File

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

3
needles/anaconda_select_install_lang_french_filtered-cantarell18.json
View File

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

3
needles/anaconda_select_install_lang_french_filtered-freetype262.json
View File

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

1
needles/anaconda_select_install_lang_french_filtered.json
View File

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

3
needles/anaconda_spoke_done-freetype262.json
View File

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

1
needles/anaconda_spoke_done.json
View File

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

3
needles/anaconda_spoke_done_french-freetype262.json
View File

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

3
needles/anaconda_spoke_done_french.json
View File

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

3
needles/anaconda_spoke_done_lighter.json
View File

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

3
needles/anaconda_spoke_done_olddpi.json
View File

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

1
needles/bootloader_uefi.json
View File

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

4
needles/gnome_desktop_clean-cantarell18.json
View File

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

4
needles/gnome_desktop_clean-freetype262.json
View File

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

2
needles/gnome_desktop_clean.json
View File

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

4
needles/gnome_desktop_runner-cantarell17.json
View File

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

2
needles/gnome_desktop_runner.json
View File

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

1
needles/graphical_login_gdm.json
View File

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

3
needles/graphical_login_gdm_input.json
View File

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

2
needles/graphical_login_sddm.json
View File

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

2
needles/kde_desktop_runner.json
View File

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

4
needles/kde_desktop_runner2.json
View File

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

2
needles/kde_live_anaconda_icon.json
View File

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

4
needles/workstation_live_initial-20151204-lighter.json
View File

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

2
needles/workstation_live_initial.json
View File

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

2
templates
View File

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