Differential D534

add 32bit disk creation, correct 64bit disk creation
ClosedPublic
Actions

Authored by garretraziel on Aug 26 2015, 8:51 AM.

Details

Reviewers
adamwill
jskladan
Maniphest Tasks
T570: Create Fedora <previous_version> disk images for 32bit machine
Commits
rOPENQAa24941085e18: add 32bit disk creation
Summary

Add code for creating 32bit disk images (desktop and minimal),
and correct 64bit disk images slightly (for example, force 64bit arch).

Test Plan

Create disks with ./createhdds.sh.

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 add 32bit disk creation, correct 64bit disk creation.Aug 26 2015, 8:51 AM
garretraziel updated this object.
garretraziel edited the test plan for this revision. (Show Details)
garretraziel added reviewers: jskladan, adamwill.
garretraziel updated this revision to Diff 1396.Aug 26 2015, 9:41 AM

correct test names in conf_test_suites

jskladan requested changes to this revision.Aug 27 2015, 8:28 AM

Gooby pls...

Merge the disk_f22_desktop_64bit/32bit (and so on) methods into one, which takes an ARCH parameter

kthxbai!

This revision now requires changes to proceed.Aug 27 2015, 8:28 AM
garretraziel updated this revision to Diff 1404.Aug 27 2015, 11:18 AM
  • create functions
This revision is now accepted and ready to land.Aug 27 2015, 11:24 AM
jskladan added inline comments.Aug 27 2015, 11:24 AM
tools/createhdds.sh
161–162

pls change to: USAGE: $0 ... thx!

Closed by commit rOPENQAa24941085e18: add 32bit disk creation (authored by garretraziel). · Explain WhyAug 27 2015, 11:49 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

Diff 1406

View Options

InstallGuide.md

Show First 20 Lines • Show All 70 Lines • ▼ Show 20 Line(s)698. set up fedora tests from repo
71 zypper in guestfs-tools 71​ zypper in guestfs-tools
72 git clone http://bitbucket.org/rajcze/openqa_fedora.git /var/lib/openqa/tests/fedora 72​ git clone http://bitbucket.org/rajcze/openqa_fedora.git /var/lib/openqa/tests/fedora
73 chown -R geekotest /var/lib/openqa/tests/ 73​ chown -R geekotest /var/lib/openqa/tests/
74 74​
759. set up disks 75​9. set up disks
76 76​
77 git clone http://bitbucket.org/rajcze/openqa_fedora_tools.git ~/openqa_fedora_tools 77​ git clone http://bitbucket.org/rajcze/openqa_fedora_tools.git ~/openqa_fedora_tools
78 cd /var/lib/openqa/factory/hdd/ 78​ cd /var/lib/openqa/factory/hdd/
79 bash ~/openqa_fedora_tools/tools/createhdds.sh 79​ bash ~/openqa_fedora_tools/tools/createhdds.sh VERSION # version is current stable Fedora version
80 chown geekotest * 80​ chown geekotest *
81 81​
8210. setup services 82​10. setup services
83 83​
84 systemctl enable apache2 84​ systemctl enable apache2
85 systemctl restart apache2 85​ systemctl restart apache2
86 systemctl enable openqa-webui 86​ systemctl enable openqa-webui
87 systemctl restart openqa-webui 87​ systemctl restart openqa-webui
▲ Show 20 Lines • Show All 41 Lines • Show Last 20 Lines
View Options

docker/README.md

Show First 20 Lines • Show All 73 Lines • ▼ Show 20 Line(s)72## Run the Worker container
74 docker run -h openqa_worker_1 --name openqa_worker_1 -d --link openqa_webui:openqa_webui --volumes-from openqa_data --volumes-from openqa_webui --privileged fedoraqa/openqa_worker:4.1-3.12 1 74​ docker run -h openqa_worker_1 --name openqa_worker_1 -d --link openqa_webui:openqa_webui --volumes-from openqa_data --volumes-from openqa_webui --privileged fedoraqa/openqa_worker:4.1-3.12 1
75 75​
76Check whether the worker connected in the WebUI's administration interface. 76​Check whether the worker connected in the WebUI's administration interface.
77 77​
78To add more workers, increase number that is used in hostname, container name and at the end of command, so to add worker 2 use: 78​To add more workers, increase number that is used in hostname, container name and at the end of command, so to add worker 2 use:
79 79​
80 docker run -h openqa_worker_2 --name openqa_worker_2 -d --link openqa_webui:openqa_webui --volumes-from openqa_data --volumes-from openqa_webui --privileged fedoraqa/openqa_worker:4.1-3.12 2 80​ docker run -h openqa_worker_2 --name openqa_worker_2 -d --link openqa_webui:openqa_webui --volumes-from openqa_data --volumes-from openqa_webui --privileged fedoraqa/openqa_worker:4.1-3.12 2
81 81​
82## Get tests and ISOs 82​## Get tests, ISOs and create disks
83 83​
84You have to put your tests under `data/tests` directory and ISOs under `data/factory/iso` directory. For example, for testing Fedora, run: 84​You have to put your tests under `data/tests` directory and ISOs under `data/factory/iso` directory. For example, for testing Fedora, run:
85 85​
86 git clone https://bitbucket.org/rajcze/openqa_fedora data/tests/fedora 86​ git clone https://bitbucket.org/rajcze/openqa_fedora data/tests/fedora
87 wget https://dl.fedoraproject.org/pub/alt/stage/22_Beta_RC3/Server/x86_64/iso/Fedora-Server-netinst-x86_64-22_Beta.iso -O data/factory/iso/Fedora-Server-netinst-x86_64-22_Beta_RC3.iso 87​ wget https://dl.fedoraproject.org/pub/alt/stage/22_Beta_RC3/Server/x86_64/iso/Fedora-Server-netinst-x86_64-22_Beta.iso -O data/factory/iso/Fedora-Server-netinst-x86_64-22_Beta_RC3.iso
88 88​
89And set permissions, so any user can read/write the data: 89​And set permissions, so any user can read/write the data:
90 90​
91 chmod -R 777 data 91​ chmod -R 777 data
92 92​
93This step is unfortunately necessary because Docker [can't mount volume with specific user ownership](https://github.com/docker/docker/issues/7198) in container, so ownership of mounted folders (uid and gid) is the same as on your host system (presumably 1000:1000 which maps into nonexistent user in all of the containers). 93​This step is unfortunately necessary because Docker [can't mount volume with specific user ownership](https://github.com/docker/docker/issues/7198) in container, so ownership of mounted folders (uid and gid) is the same as on your host system (presumably 1000:1000 which maps into nonexistent user in all of the containers).
94 94​
95If you wish to keep the tests (for example) separate from the shared directory, for any reason (we do, in our development scenario) refer to the [Developing tests with Container setup] section at the end of this document. 95​If you wish to keep the tests (for example) separate from the shared directory, for any reason (we do, in our development scenario) refer to the [Developing tests with Container setup] section at the end of this document.
96 96​
97Populate the OpenQA's database: 97​Populate the OpenQA's database:
98 98​
99 docker exec openqa_webui /var/lib/openqa/tests/fedora/templates 99​ docker exec openqa_webui /var/lib/openqa/tests/fedora/templates
100 100​
101​Create all necessary disk images:
102​
103​ cd data/factory/hdd && createhdds.sh VERSION
104​
105​where `VERSION` is current stable Fedora version (its images will be created for upgrade tests) and createhdds.sh is in `openqa_fedora_tools` repository in `/tools` directory. Note that you have to have `libguestfs-tools` and `libguestfs-xfs` installed.
106​
101 107​
102# Running jobs 108​# Running jobs
103 109​
104After performing the "setup" tasks above - do not forget about tests and ISOs - you can schedule a test like this: 110​After performing the "setup" tasks above - do not forget about tests and ISOs - you can schedule a test like this:
105 111​
106 docker exec openqa_webui /var/lib/openqa/script/client isos post ISO=Fedora-Server-netinst-x86_64-22_Beta_RC3.iso DISTRI=fedora VERSION=rawhide FLAVOR=generic_boot ARCH=x86_64 BUILD=22_Beta_RC3 112​ docker exec openqa_webui /var/lib/openqa/script/client isos post ISO=Fedora-Server-netinst-x86_64-22_Beta_RC3.iso DISTRI=fedora VERSION=rawhide FLAVOR=generic_boot ARCH=x86_64 BUILD=22_Beta_RC3
107 113​
108# Other specific cases 114​# Other specific cases
▲ Show 20 Lines • Show All 48 Lines • Show Last 20 Lines
View Options

tools/createhdds.sh

1#!/bin/bash 1​#!/bin/bash
2​
2function disk_full { 3​function disk_full {
3echo "Creating disk_full.img..." 4​echo "Creating disk_full.img..."
4guestfish <<_EOF_ 5​guestfish <<_EOF_
5sparse disk_full.img 10G 6​sparse disk_full.img 10G
6run 7​run
7part-init /dev/sda mbr 8​part-init /dev/sda mbr
8part-add /dev/sda p 1 10485760 9​part-add /dev/sda p 1 10485760
9part-add /dev/sda p 10485761 -1 10​part-add /dev/sda p 10485761 -1
Show All 16 Lines
26part-init /dev/sda mbr 27​part-init /dev/sda mbr
27part-add /dev/sda p 4096 2097152 28​part-add /dev/sda p 4096 2097152
28mkfs ext4 /dev/sda1 29​mkfs ext4 /dev/sda1
29mount /dev/sda1 / 30​mount /dev/sda1 /
30write /testfile "Hello, world!" 31​write /testfile "Hello, world!"
31_EOF_ 32​_EOF_
32} 33​}
33 34​
34function disk_f22_minimal { 35​function disk_minimal {
35echo "Creating disk_f22_minimal.img..." 36​version=$1
36virt-builder fedora-22 -o disk_f22_minimal.img --update --selinux-relabel --root-password password:weakpassword > /dev/null 37​arch=$2
38​echo "Creating disk_f${version}_minimal_${arch}.img..."
39​virt-builder fedora-${version} -o disk_f${version}_minimal_${arch}.img --arch ${arch} --run-command \
40​ "setarch ${arch} dnf -y update" --selinux-relabel --root-password password:weakpassword > /dev/null
37expect <<_EOF_ 41​expect <<_EOF_
38log_user 0 42​log_user 0
39set timeout -1 43​set timeout -1
40 44​
41spawn qemu-kvm -m 2G -nographic disk_f22_minimal.img 45​spawn qemu-kvm -m 2G -nographic disk_f${version}_minimal_${arch}.img
42 46​
43expect "localhost login:" 47​expect "localhost login:"
44send "root\r" 48​send "root\r"
45expect "Password:" 49​expect "Password:"
46send "weakpassword\r" 50​send "weakpassword\r"
47expect "~]#" 51​expect "~]#"
48send "poweroff\r" 52​send "poweroff\r"
49expect "reboot: Power down" 53​expect "reboot: Power down"
50_EOF_ 54​_EOF_
51} 55​}
52 56​
53function disk_f22_desktop { 57​function disk_desktop {
54echo "Creating disk_f22_desktop.img..." 58​version=$1
59​arch=$2
60​echo "Creating disk_f${version}_desktop_${arch}.img..."
55# these steps are required 61​# these steps are required
56# 1. remove firewalld - firewalld configuration in minimal and desktop are conflicting 62​# 1. remove firewalld - firewalld configuration in minimal and desktop are conflicting
57# 2. update fedora 63​# 2. update fedora
58# 3. install @Fedora Workstation group 64​# 3. install @Fedora Workstation group
59# 4. add new user on first boot 65​# 4. add new user on first boot
60# 5. use expect to do selinux relabelling and to set password for user 66​# 5. use expect to do selinux relabelling and to set password for user
61virt-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 67​virt-builder fedora-${version} -o disk_f${version}_desktop_${arch}.img --size 20G --arch ${arch} --run-command \
68​ "setarch ${arch} dnf -y remove firewalld* && setarch ${arch} dnf -y update && setarch ${arch} dnf -y install @'Fedora Workstation'" \
69​ --selinux-relabel --root-password password:weakpassword --firstboot-command 'useradd -m -p "" ejohn' > /dev/null
62expect <<_EOF_ 70​expect <<_EOF_
63log_user 0 71​log_user 0
64set timeout -1 72​set timeout -1
65 73​
66spawn qemu-kvm -m 2G -nographic disk_f22_desktop.img 74​spawn qemu-kvm -m 2G -nographic disk_f${version}_desktop_${arch}.img
67 75​
68expect "localhost login:" 76​expect "localhost login:"
69send "root\r" 77​send "root\r"
70expect "Password:" 78​expect "Password:"
71send "weakpassword\r" 79​send "weakpassword\r"
72expect "~]#" 80​expect "~]#"
73send "systemctl set-default graphical.target\r" 81​send "systemctl set-default graphical.target\r"
74send "echo 'ejohn:weakpassword' | chpasswd\r" 82​send "echo 'ejohn:weakpassword' | chpasswd\r"
Show All 25 Lines
100part-init /dev/sda mbr 108​part-init /dev/sda mbr
101part-add /dev/sda p 4096 -1 109​part-add /dev/sda p 4096 -1
102mkfs ext4 /dev/sda1 label:UPDATES_IMG 110​mkfs ext4 /dev/sda1 label:UPDATES_IMG
103mount /dev/sda1 / 111​mount /dev/sda1 /
104upload /tmp/updates.img /updates.img 112​upload /tmp/updates.img /updates.img
105_EOF_ 113​_EOF_
106} 114​}
107 115​
108if [ "$#" -eq 0 ]; then 116​if [[ "$1" != "" ]]; then
117​ VERSION="$1"
118​ shift
119​ if [[ "$#" -eq 0 ]]; then
109 disk_full 120​ disk_full
110 disk_freespace 121​ disk_freespace
111 disk_f22_minimal 122​ disk_minimal ${VERSION} "x86_64"
112 disk_f22_desktop 123​ disk_minimal ${VERSION} "i686"
124​ disk_desktop ${VERSION} "x86_64"
125​ disk_desktop ${VERSION} "i686"
113 disk_ks 126​ disk_ks
114 disk_updates_img 127​ disk_updates_img
115else 128​ else
116 case $1 in 129​ case $1 in
117 full) 130​ full)
118 disk_full 131​ disk_full
119 ;; 132​ ;;
120 freespace) 133​ freespace)
121 disk_freespace 134​ disk_freespace
122 ;; 135​ ;;
123 minimal) 136​ minimal_64bit)
124 disk_f22_minimal 137​ disk_minimal ${VERSION} "x86_64"
138​ ;;
139​ minimal_32bit)
140​ disk_minimal ${VERSION} "i686"
141​ ;;
142​ desktop_64bit)
143​ disk_desktop ${VERSION} "x86_64"
125 ;; 144​ ;;
126 desktop) 145​ desktop_32bit)
127 disk_f22_desktop 146​ disk_desktop ${VERSION} "i686"
128 ;; 147​ ;;
129 ks) 148​ ks)
130 disk_ks 149​ disk_ks
131 ;; 150​ ;;
132 updates) 151​ updates)
133 disk_updates_img 152​ disk_updates_img
134 ;; 153​ ;;
135 *) 154​ *)
136 echo "$0 [full|freespace|minimal|desktop|ks|updates]" 155​ echo "name not in [full|freespace|minimal_64bit|minimal_32bit|desktop_64bit|desktop_32bit|ks|updates]"
156​ exit 1
137 ;; 157​ ;;
138 esac 158​ esac
139fi 159​ fi
160​else
161​ echo "USAGE: $0 VERSION [full|freespace|minimal_64bit|minimal_32bit|desktop_64bit|desktop_32bit|ks|updates]"
162​ exit 1
jskladanUnsubmitted
Not Done

pls change to: USAGE: $0 ... thx!

163​fi
View Options

tools/openqa_trigger/conf_test_suites.py

Show First 20 Lines • Show All 279 Lines • ▼ Show 20 Line(s)275 "server_software_raid": [
280 "QA:Testcase_Package_Sets_Minimal_Package_Install", 280​ "QA:Testcase_Package_Sets_Minimal_Package_Install",
281 ], 281​ ],
282 "server_kickstart_hdd": [ 282​ "server_kickstart_hdd": [
283 "QA:Testcase_install_to_VirtIO", 283​ "QA:Testcase_install_to_VirtIO",
284 "QA:Testcase_Anaconda_user_creation", 284​ "QA:Testcase_Anaconda_user_creation",
285 "QA:Testcase_kickstart_user_creation", 285​ "QA:Testcase_kickstart_user_creation",
286 "QA:Testcase_Kickstart_Hd_Device_Path_Ks_Cfg", 286​ "QA:Testcase_Kickstart_Hd_Device_Path_Ks_Cfg",
287 ], 287​ ],
288 "fedup_minimal": [ 288​ "fedup_minimal_64bit": [
289 "QA:Testcase_upgrade_fedup_cli_previous_minimal", 289​ "QA:Testcase_upgrade_fedup_cli_previous_minimal",
290 ], 290​ ],
291 "fedup_desktop": [ 291​ "fedup_desktop_64bit": [
292​ "QA:Testcase_upgrade_fedup_cli_previous_workstation",
293​ ],
294​ "fedup_minimal_32bit": [
295​ "QA:Testcase_upgrade_fedup_cli_previous_minimal",
296​ ],
297​ "fedup_desktop_32bit": [
292 "QA:Testcase_upgrade_fedup_cli_previous_workstation", 298​ "QA:Testcase_upgrade_fedup_cli_previous_workstation",
293 ], 299​ ],
294 "server_btrfs": [ 300​ "server_btrfs": [
295 "QA:Testcase_install_to_VirtIO", 301​ "QA:Testcase_install_to_VirtIO",
296 "QA:Testcase_partitioning_custom_btrfs", 302​ "QA:Testcase_partitioning_custom_btrfs",
297 "QA:Testcase_Anaconda_User_Interface_Graphical", 303​ "QA:Testcase_Anaconda_User_Interface_Graphical",
298 "QA:Testcase_Anaconda_user_creation", 304​ "QA:Testcase_Anaconda_user_creation",
299 "QA:Testcase_Package_Sets_Minimal_Package_Install", 305​ "QA:Testcase_Package_Sets_Minimal_Package_Install",
Show All 30 Lines