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

Authored by garretraziel on Dec 1 2015, 8:49 AM.

Details

Reviewers

adamwill
jskladan

Commits

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

Summary

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.

Test Plan

see if all existing tests work

Diff Detail

Repository

rOPENQATESTS os-autoinst-distri-fedora

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

garretraziel retitled this revision from to remove ENV-DESKTOP- tag, set DESKTOP- tag instead where necessary.Dec 1 2015, 8:49 AM

garretraziel updated this object.

garretraziel edited the test plan for this revision. (Show Details)

garretraziel added reviewers: adamwill, jskladan.

Herald added a subscriber: tflink. · View Herald TranscriptDec 1 2015, 8:49 AM

jskladan accepted this revision.Dec 1 2015, 10:24 AM

This revision is now accepted and ready to land.Dec 1 2015, 10:24 AM

garretraziel mentioned this in D673: add KDE package set testcase.Dec 1 2015, 3:32 PM

garretraziel added a dependent revision: D673: add KDE package set testcase.Dec 1 2015, 3:32 PM

see, I told you my silly complicated function would be useful ;)

Looks fine to me by eye, I don't have time to test it out right now (and Rawhide nightlies are busted anyhow), I'll try and get to it later.

This looks fine. You may need to re-diff a bit for my recent changes (freetype262 needles), but I'm fine with that happening on commit.

Closed by commit rOPENQATESTS6e801bcd528f: remove ENV-DESKTOP- tag, set DESKTOP- tag instead where necessary (authored by garretraziel). · Explain WhyDec 8 2015, 10:34 AM

This revision was automatically updated to reflect the committed changes.

garretraziel mentioned this in rOPENQATESTSfd2ed441628f: add KDE package set testcase.Dec 8 2015, 10:50 AM

Revision Contents

			Path	Packages
M			main.pm (5 lines)
M			needles/anaconda_install_done-freetype262.json (3 lines)
M			needles/anaconda_install_done.json (1 line)
M			needles/anaconda_install_done_french-freetype262.json (3 lines)
M			needles/anaconda_install_done_french.json (3 lines)
M			needles/anaconda_install_root_password.json (1 line)
M			needles/anaconda_install_user_creation.json (1 line)
M			needles/anaconda_install_user_creation_make_admin-freetype262.json (3 lines)
M			needles/anaconda_install_user_creation_make_admin.json (3 lines)
M			needles/anaconda_install_user_creation_make_admin_french-freetype262.json (3 lines)
M			needles/anaconda_install_user_creation_make_admin_french.json (1 line)
M			needles/anaconda_main_hub_begin_installation-cantarell17.json (3 lines)
M			needles/anaconda_main_hub_begin_installation-freetype262.json (3 lines)
M			needles/anaconda_main_hub_begin_installation.json (3 lines)
M			needles/anaconda_main_hub_begin_installation_french-freetype262.json (3 lines)
M			needles/anaconda_main_hub_begin_installation_french.json (1 line)
M			needles/anaconda_main_hub_install_destination.json (1 line)
M			needles/anaconda_select_install_lang_continue-cantarell17.json (3 lines)
M			needles/anaconda_select_install_lang_continue-freetype262.json (3 lines)
M			needles/anaconda_select_install_lang_continue.json (3 lines)
M			needles/anaconda_select_install_lang_continue_french-cantarell17.json (1 line)
M			needles/anaconda_select_install_lang_continue_french.json (1 line)
M			needles/anaconda_select_install_lang_english_filtered-cantarell18.json (3 lines)
M			needles/anaconda_select_install_lang_english_filtered.json (1 line)
M			needles/anaconda_select_install_lang_french_filtered-cantarell17.json (3 lines)
M			needles/anaconda_select_install_lang_french_filtered-cantarell18.json (3 lines)
M			needles/anaconda_select_install_lang_french_filtered-freetype262.json (3 lines)
M			needles/anaconda_select_install_lang_french_filtered.json (1 line)
M			needles/anaconda_spoke_done-freetype262.json (3 lines)
M			needles/anaconda_spoke_done.json (1 line)
M			needles/anaconda_spoke_done_french-freetype262.json (3 lines)
M			needles/anaconda_spoke_done_french.json (3 lines)
M			needles/anaconda_spoke_done_lighter.json (3 lines)
M			needles/anaconda_spoke_done_olddpi.json (3 lines)
M			needles/bootloader_uefi.json (1 line)
M			needles/gnome_desktop_clean-cantarell18.json (4 lines)
M			needles/gnome_desktop_clean-freetype262.json (4 lines)
M			needles/gnome_desktop_clean.json (2 lines)
M			needles/gnome_desktop_runner-cantarell17.json (4 lines)
M			needles/gnome_desktop_runner.json (2 lines)
M			needles/graphical_login_gdm.json (1 line)
M			needles/graphical_login_gdm_input.json (3 lines)
M			needles/graphical_login_sddm.json (2 lines)
M			needles/kde_desktop_runner.json (2 lines)
M			needles/kde_desktop_runner2.json (4 lines)
M			needles/kde_live_anaconda_icon.json (2 lines)
M			needles/workstation_live_initial-20151204-lighter.json (4 lines)
M			needles/workstation_live_initial.json (2 lines)
M			templates (2 lines)

Diff	ID	Base	Description	Created	Lint	Unit
Base			Base
Diff 1	1732	7240ce7		Dec 1 2015, 8:49 AM	★	★
Diff 2	1763	35c42da	Commit rOPENQATESTS6e801bcd528fef6cfa03245074b5c71cafe6f8b1	Dec 8 2015, 10:32 AM	★	★

Commit	Tree	Parents	Author	Summary	Date
504841be161c	351d0227ffe2	7240ce774f01	Jan Sedlák	remove ENV-DESKTOP- tag, set DESKTOP- tag instead where necessary (Show More…)	Dec 1 2015, 8:43 AM

Status	Author	Revision
Closed	garretraziel	D673 add KDE package set testcase
Closed	garretraziel	D672 add KDE packageset testcase
Closed	garretraziel	D670 remove ENV-DESKTOP- tag, set DESKTOP- tag instead where necessary

Show First 20 Lines • Show All 71 Lines • ▼ Show 20 Line(s)		69	if (!get_var('LIVE') and !get_var('CANNED')) {
72	## to wait for repository setup to complete, but if we match that	72		## to wait for repository setup to complete, but if we match that
73	## spoke's "ready" icon, it breaks live and canned because they	73		## spoke's "ready" icon, it breaks live and canned because they
74	## don't have that spoke. So we have a needle which doesn't match	74		## don't have that spoke. So we have a needle which doesn't match
75	## on that icon, but we unregister it for other installs so they	75		## on that icon, but we unregister it for other installs so they
76	## don't match on it too soon.	76		## don't match on it too soon.
77	unregister_needle_tags("INSTALLER-smallhub");	77		unregister_needle_tags("INSTALLER-smallhub");
78	}	78		}
79		79
		80		# Unregister desktop needles of other desktops when DESKTOP is specified
		81		if (get_var('DESKTOP')) {
		82		unregister_prefix_tags('DESKTOP', [ get_var('DESKTOP') ])
		83		}
		84
80	# Unregister non-language-appropriate needles. See unregister_except_	85		# Unregister non-language-appropriate needles. See unregister_except_
81	# tags for details; basically all needles with at least one LANGUAGE-	86		# tags for details; basically all needles with at least one LANGUAGE-
82	# tag will be unregistered unless they match the current langauge.	87		# tag will be unregistered unless they match the current langauge.
83	my $langref = [ get_var('LANGUAGE') \|\| 'english' ];	88		my $langref = [ get_var('LANGUAGE') \|\| 'english' ];
84	unregister_prefix_tags('LANGUAGE', $langref);	89		unregister_prefix_tags('LANGUAGE', $langref);
85	}	90		}
86	$needle::cleanuphandler = \&cleanup_needles;	91		$needle::cleanuphandler = \&cleanup_needles;
87		92
▲ Show 20 Lines • Show All 109 Lines • Show Last 20 Lines

1	{	1	{
2	"properties": [],	2	"properties": [],
3	"tags": [	3	"tags": [
4	"anaconda_install_done",	4	"anaconda_install_done",
5	"ENV-DESKTOP-default",
6	"ENV-DISTRI-fedora",	5	"ENV-DISTRI-fedora",
7	"LANGUAGE-english"	6	"LANGUAGE-english"
8	],	7	],
9	"area": [	8	"area": [
10	{	9	{
11	"xpos": 694,	10	"xpos": 694,
12	"height": 20,	11	"height": 20,
13	"ypos": 632,	12	"ypos": 632,
Show All 13 Lines

Show All 11 Lines		10	{
12	"type": "match",	12		"type": "match",
13	"width": 17,	13		"width": 17,
14	"xpos": 1000,	14		"xpos": 1000,
15	"ypos": 680	15		"ypos": 680
16	}	16		}
17	],	17		],
18	"tags": [	18		"tags": [
19	"anaconda_install_done",	19		"anaconda_install_done",
20	"ENV-DESKTOP-default",
21	"ENV-DISTRI-fedora",	20		"ENV-DISTRI-fedora",
22	"LANGUAGE-english"	21		"LANGUAGE-english"
23	]	22		]
24	}	23		}

1	{	1	{
2	"properties": [],	2	"properties": [],
3	"tags": [	3	"tags": [
4	"anaconda_install_done",	4	"anaconda_install_done",
5	"ENV-DESKTOP-default",
6	"ENV-DISTRI-fedora",	5	"ENV-DISTRI-fedora",
7	"LANGUAGE-french"	6	"LANGUAGE-french"
8	],	7	],
9	"area": [	8	"area": [
10	{	9	{
11	"height": 20,	10	"height": 20,
12	"ypos": 632,	11	"ypos": 632,
13	"width": 410,	12	"width": 410,
Show All 13 Lines

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

Details

Diff Detail

Revision Contents

Diff 1763

main.pm

needles/anaconda_install_done-freetype262.json

needles/anaconda_install_done.json

needles/anaconda_install_done_french-freetype262.json

needles/anaconda_install_done_french.json

needles/anaconda_install_root_password.json

needles/anaconda_install_user_creation.json

needles/anaconda_install_user_creation_make_admin-freetype262.json

needles/anaconda_install_user_creation_make_admin.json

needles/anaconda_install_user_creation_make_admin_french-freetype262.json

needles/anaconda_install_user_creation_make_admin_french.json

needles/anaconda_main_hub_begin_installation-cantarell17.json

needles/anaconda_main_hub_begin_installation-freetype262.json

needles/anaconda_main_hub_begin_installation.json

needles/anaconda_main_hub_begin_installation_french-freetype262.json

needles/anaconda_main_hub_begin_installation_french.json

needles/anaconda_main_hub_install_destination.json

needles/anaconda_select_install_lang_continue-cantarell17.json

needles/anaconda_select_install_lang_continue-freetype262.json

needles/anaconda_select_install_lang_continue.json

needles/anaconda_select_install_lang_continue_french-cantarell17.json

needles/anaconda_select_install_lang_continue_french.json

needles/anaconda_select_install_lang_english_filtered-cantarell18.json

needles/anaconda_select_install_lang_english_filtered.json

needles/anaconda_select_install_lang_french_filtered-cantarell17.json

needles/anaconda_select_install_lang_french_filtered-cantarell18.json

needles/anaconda_select_install_lang_french_filtered-freetype262.json

needles/anaconda_select_install_lang_french_filtered.json

needles/anaconda_spoke_done-freetype262.json

needles/anaconda_spoke_done.json

needles/anaconda_spoke_done_french-freetype262.json

needles/anaconda_spoke_done_french.json

needles/anaconda_spoke_done_lighter.json

needles/anaconda_spoke_done_olddpi.json

needles/bootloader_uefi.json

needles/gnome_desktop_clean-cantarell18.json

needles/gnome_desktop_clean-freetype262.json

needles/gnome_desktop_clean.json

needles/gnome_desktop_runner-cantarell17.json

needles/gnome_desktop_runner.json

needles/graphical_login_gdm.json

needles/graphical_login_gdm_input.json

needles/graphical_login_sddm.json

needles/kde_desktop_runner.json

needles/kde_desktop_runner2.json

needles/kde_live_anaconda_icon.json

needles/workstation_live_initial-20151204-lighter.json

needles/workstation_live_initial.json

templates

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