Differential D569

fix updating and installing packages in virt-builder
ClosedPublic
Actions

Authored by garretraziel on Sep 9 2015, 11:01 AM.

Tags

None

Subscribers

Details

Reviewers

adamwill
jskladan

Commits

rOPENQA2a91e5d0ff91: fix updating and installing packages in virt-builder

Summary

With newest version of libguestfs, --update and --run-command
will use correct architecture, so there is no need in running dnf -y update
by hand.

Test Plan

Try to build F22 32bit minimal and desktop images.

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 fix updating and installing packages in virt-builder.Sep 9 2015, 11:01 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 TranscriptSep 9 2015, 11:01 AM

You have to use this version of libguestfs: https://bodhi.fedoraproject.org/updates/FEDORA-2015-15401

jskladan accepted this revision.Sep 9 2015, 12:25 PM

This revision is now accepted and ready to land.Sep 9 2015, 12:25 PM

Looks fine, works fine.

Closed by commit rOPENQA2a91e5d0ff91: fix updating and installing packages in virt-builder (authored by garretraziel). · Explain WhySep 10 2015, 7:35 AM

This revision was automatically updated to reflect the committed changes.

Revision Contents

			Path	Packages
M			tools/createhdds.sh (10 lines)

Diff 1490

tools/createhdds.sh

Show All 32 Lines
33	write /testfile "Hello, world!"	33		write /testfile "Hello, world!"
34	_EOF_	34		_EOF_
35	}	35		}
36		36
37	function disk_minimal {	37		function disk_minimal {
38	version=$1	38		version=$1
39	arch=$2	39		arch=$2
40	echo "Creating disk_f${version}_minimal_${arch}.img..."	40		echo "Creating disk_f${version}_minimal_${arch}.img..."
41	virt-builder fedora-${version} -o disk_f${version}_minimal_${arch}.img --arch ${arch} --run-command \	41		virt-builder fedora-${version} -o disk_f${version}_minimal_${arch}.img --arch ${arch} --update --selinux-relabel \
42	"setarch ${arch} dnf -y update" --selinux-relabel --root-password password:weakpassword > /dev/null	42		--root-password password:weakpassword > /dev/null
43	expect <<_EOF_	43		expect <<_EOF_
44	log_user 0	44		log_user 0
45	set timeout -1	45		set timeout -1
46		46
47	spawn qemu-kvm -m 2G -nographic disk_f${version}_minimal_${arch}.img	47		spawn qemu-kvm -m 2G -nographic disk_f${version}_minimal_${arch}.img
48		48
49	expect "localhost login:"	49		expect "localhost login:"
50	send "root\r"	50		send "root\r"
Show All 10 Lines
61	arch=$2	61		arch=$2
62	echo "Creating disk_f${version}_desktop_${arch}.img..."	62		echo "Creating disk_f${version}_desktop_${arch}.img..."
63	# these steps are required	63		# these steps are required
64	# 1. remove firewalld - firewalld configuration in minimal and desktop are conflicting	64		# 1. remove firewalld - firewalld configuration in minimal and desktop are conflicting
65	# 2. update fedora	65		# 2. update fedora
66	# 3. install @Fedora Workstation group	66		# 3. install @Fedora Workstation group
67	# 4. add new user on first boot	67		# 4. add new user on first boot
68	# 5. use expect to do selinux relabelling and to set password for user	68		# 5. use expect to do selinux relabelling and to set password for user
69	virt-builder fedora-${version} -o disk_f${version}_desktop_${arch}.img --size 20G --arch ${arch} --run-command \	69		virt-builder fedora-${version} -o disk_f${version}_desktop_${arch}.img --size 20G --arch ${arch} --update \
70	"setarch ${arch} dnf -y remove firewalld* && setarch ${arch} dnf -y update && setarch ${arch} dnf -y install @'Fedora Workstation'" \	70		--run-command "dnf -y remove firewalld* && dnf -y install @'Fedora Workstation'" --selinux-relabel \
71	--selinux-relabel --root-password password:weakpassword --firstboot-command 'useradd -m -p "" ejohn' > /dev/null	71		--root-password password:weakpassword --firstboot-command 'useradd -m -p "" ejohn' > /dev/null
72	expect <<_EOF_	72		expect <<_EOF_
73	log_user 0	73		log_user 0
74	set timeout -1	74		set timeout -1
75		75
76	spawn qemu-kvm -m 2G -nographic disk_f${version}_desktop_${arch}.img	76		spawn qemu-kvm -m 2G -nographic disk_f${version}_desktop_${arch}.img
77		77
78	expect "localhost login:"	78		expect "localhost login:"
79	send "root\r"	79		send "root\r"
▲ Show 20 Lines • Show All 111 Lines • Show Last 20 Lines