Details

Reviewers

adamwill
jskladan

Maniphest Tasks

T539: OpenQA test - QA:Testcase_Anaconda_updates.img_via_local_media

Commits

rOPENQAd5345e096f9e: add creation of disk containing updates.img

Summary

Create disk, containing updates.img in createhdds.sh, also modularize
it a little bit.

Since openqa_fedora repo now contains VARIABLES.md
file that includes all relevant variables, QEMU_variables.txt is
no longer needed and could confuse someone.

Another change is with REPOSITORY_GRAPHICAL and REPOSITORY_VARIATION
variables - current instructions on how to set them were out of date.

Test Plan

only testable thing is createhdds.sh - try to run it with or without argument

Diff Detail

Repository

rOPENQA fedora_openqa

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 clean QEMU_variables.txt, small update in documentation.Aug 10 2015, 1:03 PM

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 TranscriptAug 10 2015, 1:03 PM

updates in createhdds.sh and PhaseSeparation.md

garretraziel retitled this revision from clean QEMU_variables.txt, small update in documentation to add another disk creation to createhdds.sh, clean QEMU_variables.txt, bump PhaseSeparation.md and documentation.Aug 12 2015, 8:16 AM

garretraziel updated this object.

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

garretraziel added a project: fedora_openqa.

garretraziel mentioned this in D496: add updates.img via local media test.Aug 12 2015, 10:57 AM

garretraziel added a dependent revision: D496: add updates.img via local media test.Aug 12 2015, 11:03 AM

garretraziel added a dependent revision: D497: add updates.img via local media test.

garretraziel added a task: T539: OpenQA test - QA:Testcase_Anaconda_updates.img_via_local_media.Aug 12 2015, 11:25 AM

I think *ideally* at least the code and doc changes here should be separate commits (and you could even split the code change into the refactor, updating the version on the 'minimal' image, and adding the updates image). But the actual changes seem OK aside from the inline comments.

InstallGuide.md
118 ↗	(On Diff #1305)	Probably want to update this to 23 rather than 22 as well?
tools/createhdds.sh
34–36	If you're going to change this you should also change the fedup test in `templates` (where this image is used). It's only used for a known-broken fedup test, but still, it doesn't make any sense for them not to line up (and I guess we'll build the new-upgrade-mechanism tests from the charred remains of the fedup tests, so we probably want to keep them in order).
61	You need to change `fedora-21` to `fedora-22` here.

This revision now requires changes to proceed.Aug 13 2015, 5:54 PM

tools/createhdds.sh
61	...sorry, lost a comment - and again, change the fedup test in `templates` which uses this image.

correct fedora-21 -> fedora-22, use F23 in link

garretraziel mentioned this in D502: use disk_f22 instead disk_f21 in templates.Aug 14 2015, 8:54 AM

Required change in templates is in D502.

This looks like it's functionally OK now, but I still kinda think it ought to be split at least into separate code and doc commits.

In D494#9448, @adamwill wrote:

This looks like it's functionally OK now, but I still kinda think it ought to be split at least into separate code and doc commits.

I was planning to split it before merge, but okay, I'm doing it now :-)

update InstallGuide for F23, correct things in PhaseSeparation, remove QEMU_variables
modularize createhdds.sh a bit, create f22 images instead of f21

The code overall LGTM, just make sure to split the changes to a reasonable amount of commits. I know that Phab does not make it easy to do/show, apart of using multiple D-requests, which then lack in readability, but hey, nothing's perfect

OK so should I merge this as several commits or create new D-requests?

Merging it as several commits would be fine with me.

Closed by commit rOPENQAd5345e096f9e: add creation of disk containing updates.img (authored by garretraziel). · Explain WhyAug 17 2015, 3:26 PM

This revision was automatically updated to reflect the committed changes.

Diff	ID	Base	Description	Created	Lint	Unit
Base			Base
Diff 1	1296	3939a4b		Aug 10 2015, 1:03 PM	★	★
Diff 2	1305	3939a4b	updates in createhdds.sh and PhaseSeparation.md	Aug 12 2015, 8:07 AM	★	★
Diff 3	1314	3939a4b	correct fedora-21 -> fedora-22, use F23 in link	Aug 14 2015, 8:50 AM	★	★
Diff 4	1316	3939a4b	- update InstallGuide for F23, correct things in PhaseSeparation, remove QEMU_variables	Aug 14 2015, 1:43 PM	★	★
Diff 5	1323	ebb4af0	Commit rOPENQAd5345e096f9efcb489a9ac5c0a2c324fda67062f	Aug 17 2015, 3:22 PM	★	★

Commit	Tree	Parents	Author	Summary	Date
e532c4281a58	562ebb943380	e9f035425362	Jan Sedlák	modularize createhdds.sh a bit, create f22 images instead of f21	Aug 14 2015, 1:43 PM
e9f035425362	f008f4af7691	3939a4bc4063	Jan Sedlák	update InstallGuide for F23, correct things in PhaseSeparation, remove… (Show More…)	Aug 14 2015, 1:42 PM

Show All 25 Lines
26	part-init /dev/sda mbr	26		part-init /dev/sda mbr
27	part-add /dev/sda p 4096 2097152	27		part-add /dev/sda p 4096 2097152
28	mkfs ext4 /dev/sda1	28		mkfs ext4 /dev/sda1
29	mount /dev/sda1 /	29		mount /dev/sda1 /
30	write /testfile "Hello, world!"	30		write /testfile "Hello, world!"
31	_EOF_	31		_EOF_
32	}	32		}
33		33
34	function disk_f22_minimal {	34		function disk_f22_minimal {
35	echo "Creating disk_f22_minimal.img..."	35		echo "Creating disk_f22_minimal.img..."
36	virt-builder fedora-22 -o disk_f22_minimal.img --update --selinux-relabel --root-password password:weakpassword > /dev/null	36		virt-builder fedora-22 -o disk_f22_minimal.img --update --selinux-relabel --root-password password:weakpassword > /dev/null
			adamwillUnsubmitted Not Done If you're going to change this you should also change the fedup test in `templates` (where this image is used). It's only used for a known-broken fedup test, but still, it doesn't make any sense for them not to line up (and I guess we'll build the new-upgrade-mechanism tests from the charred remains of the fedup tests, so we probably want to keep them in order).
37	expect <<_EOF_	37		expect <<_EOF_
38	log_user 0	38		log_user 0
39	set timeout -1	39		set timeout -1
40		40
41	spawn qemu-kvm -m 2G -nographic disk_f22_minimal.img	41		spawn qemu-kvm -m 2G -nographic disk_f22_minimal.img
42		42
43	expect "localhost login:"	43		expect "localhost login:"
44	send "root\r"	44		send "root\r"
45	expect "Password:"	45		expect "Password:"
46	send "weakpassword\r"	46		send "weakpassword\r"
47	expect "~]#"	47		expect "~]#"
48	send "poweroff\r"	48		send "poweroff\r"
49	expect "reboot: Power down"	49		expect "reboot: Power down"
50	_EOF_	50		_EOF_
51	}	51		}
52		52
53	function disk_f22_desktop {	53		function disk_f22_desktop {
54	echo "Creating disk_f22_desktop.img..."	54		echo "Creating disk_f22_desktop.img..."
55	# these steps are required	55		# these steps are required
56	# 1. remove firewalld - firewalld configuration in minimal and desktop are conflicting	56		# 1. remove firewalld - firewalld configuration in minimal and desktop are conflicting
57	# 2. update fedora	57		# 2. update fedora
58	# 3. install @Fedora Workstation group	58		# 3. install @Fedora Workstation group
59	# 4. add new user on first boot	59		# 4. add new user on first boot
60	# 5. use expect to do selinux relabelling and to set password for user	60		# 5. use expect to do selinux relabelling and to set password for user
61	virt-builder fedora-22 -o disk_f22_desktop.img --size 10G --run-command "yum -y remove firewalld*" --update --selinux-relabel --install "@^workstation-product-environment" --root-password password:weakpassword --firstboot-command 'useradd -m -p "" ejohn' > /dev/null	61		virt-builder fedora-22 -o disk_f22_desktop.img --size 10G --run-command "yum -y remove firewalld*" --update --selinux-relabel --install "@^workstation-product-environment" --root-password password:weakpassword --firstboot-command 'useradd -m -p "" ejohn' > /dev/null
			adamwillUnsubmitted Not Done You need to change `fedora-21` to `fedora-22` here.
			adamwillUnsubmitted Not Done ...sorry, lost a comment - and again, change the fedup test in `templates` which uses this image.
62	expect <<_EOF_	62		expect <<_EOF_
63	log_user 0	63		log_user 0
64	set timeout -1	64		set timeout -1
65		65
66	spawn qemu-kvm -m 2G -nographic disk_f22_desktop.img	66		spawn qemu-kvm -m 2G -nographic disk_f22_desktop.img
67		67
68	expect "localhost login:"	68		expect "localhost login:"
69	send "root\r"	69		send "root\r"
Show All 16 Lines
86	part-init /dev/sda mbr	86		part-init /dev/sda mbr
87	part-add /dev/sda p 4096 -1	87		part-add /dev/sda p 4096 -1
88	mkfs ext4 /dev/sda1	88		mkfs ext4 /dev/sda1
89	mount /dev/sda1 /	89		mount /dev/sda1 /
90	upload /tmp/root-user-crypted-net.ks /root-user-crypted-net.ks	90		upload /tmp/root-user-crypted-net.ks /root-user-crypted-net.ks
91	_EOF_	91		_EOF_
92	}	92		}
93		93
		94		function disk_updates_img {
		95		echo "Creating disk_updates_img.img..."
		96		curl --silent -o "/tmp/updates.img" "https://fedorapeople.org/groups/qa/updates/updates-unipony.img" > /dev/null
		97		guestfish <<_EOF_
		98		sparse disk_updates_img.img 100MB
		99		run
		100		part-init /dev/sda mbr
		101		part-add /dev/sda p 4096 -1
		102		mkfs ext4 /dev/sda1 label:UPDATES_IMG
		103		mount /dev/sda1 /
		104		upload /tmp/updates.img /updates.img
		105		_EOF_
		106		}
		107
94	if [ "$#" -eq 0 ]; then	108		if [ "$#" -eq 0 ]; then
95	disk_full	109		disk_full
96	disk_freespace	110		disk_freespace
97	disk_f22_minimal	111		disk_f22_minimal
98	disk_f22_desktop	112		disk_f22_desktop
99	disk_ks	113		disk_ks
		114		disk_updates_img
100	else	115		else
101	case $1 in	116		case $1 in
102	full)	117		full)
103	disk_full	118		disk_full
104	;;	119		;;
105	freespace)	120		freespace)
106	disk_freespace	121		disk_freespace
107	;;	122		;;
108	minimal)	123		minimal)
109	disk_f22_minimal	124		disk_f22_minimal
110	;;	125		;;
111	desktop)	126		desktop)
112	disk_f22_desktop	127		disk_f22_desktop
113	;;	128		;;
114	ks)	129		ks)
115	disk_ks	130		disk_ks
116	;;	131		;;
		132		updates)
		133		disk_updates_img
		134		;;
117	*)	135		*)
118	echo "$0 [full\|freespace\|minimal\|desktop\|ks]"	136		echo "$0 [full\|freespace\|minimal\|desktop\|ks\|updates]"
119	;;	137		;;
120	esac	138		esac
121	fi	139		fi

add another disk creation to createhdds.sh, clean QEMU_variables.txt, bump PhaseSeparation.md and documentation
ClosedPublic
Actions

Details

Diff Detail

Revision Contents

Diff 1323

tools/createhdds.sh

add another disk creation to createhdds.sh, clean QEMU_variables.txt, bump PhaseSeparation.md and documentationClosedPublicActions

Details

Diff Detail

Revision Contents

Diff 1323

tools/createhdds.sh

add another disk creation to createhdds.sh, clean QEMU_variables.txt, bump PhaseSeparation.md and documentation
ClosedPublic
Actions