Differential D968

keep upload files locally, activate network in kickstarts
ClosedPublic
Actions

Authored by adamwill on Aug 12 2016, 12:19 AM.

Details

Reviewers
garretraziel
jskladan
Commits
rOPENQA732a13c00fb2: keep upload files locally, activate network in kickstarts
Summary

I've come to dislike the approach where we source files that
get included in the disk images remotely; it's unnecessarily
complicated and needlessly exposes us to unexpected changes in
the remote files. So simply keep the files in this git repo
instead, none of them is very big. This also simplifies the
code.

Also, change all the kickstarts to specify --device=link and
--activate on their network lines. These arguments *should*
be included, according to the documentation (the first to
specify which device the config is for, the second to specify
that it should be activated in the installer environment), and
I think the lack of the second is actually now a problem for
the FreeIPA kickstart enrolment test (not sure exactly what
changed to make this a problem where it wasn't before, but
*something* has, and this fixes it).

Test Plan

check that all tests still run properly. The
FreeIPA enrolment kickstart test should now get somewhat
further. Before this change, for F25 and Rawhide, it fails to
enrol at all during install. Now it should enrol properly -
that's what the kickstart changes fix, it was failing because
it wasn't using the right network config - but it still fails
when trying to log in as test1, due to RHBZ #1366403 .

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.
adamwill retitled this revision from to keep upload files locally, activate network in kickstarts.Aug 12 2016, 12:19 AM
adamwill updated this object.
adamwill edited the test plan for this revision. (Show Details)
adamwill added reviewers: jskladan, garretraziel.
garretraziel accepted this revision.Aug 15 2016, 8:36 AM

Aside from comment, LGTM.

tools/hdds.json
87

Shouldn't you update this number? But I guess that built disk remains the same, so nevermind (but then again, why have you updated imgver of disk above?).

This revision is now accepted and ready to land.Aug 15 2016, 8:36 AM
adamwill added a comment.Aug 15 2016, 3:30 PM

The contents of disk_ks change because as well as moving the files locally, this commit changes the kickstarts (adding the extra network parameters). That was actually what I wanted to fix, but I'd been wanting to move the files into the git repo for a while so I figured I'd do both things at once.

Closed by commit rOPENQA732a13c00fb2: keep upload files locally, activate network in kickstarts (authored by adamwill). · Explain WhyAug 16 2016, 12:01 AM
This revision was automatically updated to reflect the committed changes.
adamwill mentioned this in rOPENQATESTS962c350e9119: templates: disk_ks is now version 3.

Revision Contents

Diff 2491

View Options

tools/createhdds.py

Show First 20 Lines • Show All 138 Lines • ▼ Show 20 Line(s)131 for write in self.writes:
139 gfs.write(write['path'], write['content']) 139​ gfs.write(write['path'], write['content'])
140 gfs.sync() 140​ gfs.sync()
141 gfs.umount_opts("/") 141​ gfs.umount_opts("/")
142 # do file 'uploads'. in guestfs-speak that means transfer 142​ # do file 'uploads'. in guestfs-speak that means transfer
143 # a file from the host to the image, we use it to mean 143​ # a file from the host to the image, we use it to mean
144 # download a file from an http server and transfer that 144​ # download a file from an http server and transfer that
145 # to the image 145​ # to the image
146 for upload in self.uploads: 146​ for upload in self.uploads:
147 # download the file to a temp file - borrowed from ​
148 # fedora_openqa_schedule (which stole it from SO) ​
149 (_, tmpfname) = tempfile.mkstemp(prefix="createhdds") ​
150 with open(tmpfname, 'wb') as tmpfh: ​
151 resp = urlopen(upload['source']) ​
152 while True: ​
153 # This is the number of bytes to read between buffer ​
154 # flushes. Value taken from the SO example. ​
155 buff = resp.read(8192) ​
156 if not buff: ​
157 break ​
158 tmpfh.write(buff) ​
159 # as with write, the dict must specify a target 147​ # as with write, the dict must specify a target
160 # partition and location ('target') 148​ # partition and location ('target')
161 partn = gfs.list_partitions()[int(upload['part'])-1] 149​ partn = gfs.list_partitions()[int(upload['part'])-1]
162 gfs.mount(partn, "/") 150​ gfs.mount(partn, "/")
163 gfs.upload(tmpfname, upload['target']) 151​ gfs.upload('/'.join((SCRIPTDIR, 'uploads', upload['source'])), upload['target'])
164 os.remove(tmpfname) ​
165 gfs.sync() 152​ gfs.sync()
166 gfs.umount_opts("/") 153​ gfs.umount_opts("/")
167 # we're all done! rename to the correct name 154​ # we're all done! rename to the correct name
168 os.rename(tmpfile, self.filename) 155​ os.rename(tmpfile, self.filename)
169 except: 156​ except:
170 # if anything went wrong, we want to wipe the temp file 157​ # if anything went wrong, we want to wipe the temp file
171 # then raise 158​ # then raise
172 os.remove(tmpfile) 159​ os.remove(tmpfile)
▲ Show 20 Lines • Show All 555 Lines • Show Last 20 Lines
View Options

tools/hdds.json

Show First 20 Lines • Show All 48 Lines • ▼ Show 20 Line(s)47 {
49 "path" : "/testfile", 49​ "path" : "/testfile",
50 "content" : "Hello, world!" 50​ "content" : "Hello, world!"
51 } 51​ }
52 ] 52​ ]
53 }, 53​ },
54 { 54​ {
55 "name" : "ks", 55​ "name" : "ks",
56 "size" : "100M", 56​ "size" : "100M",
57 "imgver" : "2", 57​ "imgver" : "3",
58 "parts" : [ 58​ "parts" : [
59 { 59​ {
60 "filesystem" : "ext4", 60​ "filesystem" : "ext4",
61 "type" : "p", 61​ "type" : "p",
62 "start" : "4096", 62​ "start" : "4096",
63 "end" : "-1" 63​ "end" : "-1"
64 } 64​ }
65 ], 65​ ],
66 "uploads" : [ 66​ "uploads" : [
67 { 67​ {
68 "part" : "1", 68​ "part" : "1",
69 "target" : "/root-user-crypted-net.ks", 69​ "target" : "/root-user-crypted-net.ks",
70 "source" : "https://jskladan.fedorapeople.org/kickstarts/root-user-crypted-net.ks" 70​ "source" : "root-user-crypted-net.ks"
71 }, 71​ },
72 { 72​ {
73 "part" : "1", 73​ "part" : "1",
74 "target" : "/freeipa.ks", 74​ "target" : "/freeipa.ks",
75 "source" : "https://www.happyassassin.net/ks/oqipas.ks" 75​ "source" : "freeipa.ks"
76 }, 76​ },
77 { 77​ {
78 "part" : "1", 78​ "part" : "1",
79 "target" : "/freeipaclient.ks", 79​ "target" : "/freeipaclient.ks",
80 "source" : "https://www.happyassassin.net/ks/oqipac.ks" 80​ "source" : "freeipaclient.ks"
81 } 81​ }
82 ] 82​ ]
83 }, 83​ },
84 { 84​ {
85 "name" : "updates_img", 85​ "name" : "updates_img",
86 "size" : "100M", 86​ "size" : "100M",
87 "imgver" : "2", 87​ "imgver" : "2",
garretrazielUnsubmitted
Not Done

Shouldn't you update this number? But I guess that built disk remains the same, so nevermind (but then again, why have you updated imgver of disk above?).

88 "parts" : [ 88​ "parts" : [
89 { 89​ {
90 "filesystem" : "ext4", 90​ "filesystem" : "ext4",
91 "label" : "UPDATES_IMG", 91​ "label" : "UPDATES_IMG",
92 "type" : "p", 92​ "type" : "p",
93 "start" : "4096", 93​ "start" : "4096",
94 "end" : "-1" 94​ "end" : "-1"
95 } 95​ }
96 ], 96​ ],
97 "uploads" : [ 97​ "uploads" : [
98 { 98​ {
99 "part" : "1", 99​ "part" : "1",
100 "target" : "/updates.img", 100​ "target" : "/updates.img",
101 "source" : "https://fedorapeople.org/groups/qa/updates/updates-openqa.img" 101​ "source" : "updates.img"
102 } 102​ }
103 ] 103​ ]
104 }, 104​ },
105 { 105​ {
106 "name" : "shrink", 106​ "name" : "shrink",
107 "size" : "10G", 107​ "size" : "10G",
108 "labels" : ["mbr", "gpt"], 108​ "labels" : ["mbr", "gpt"],
109 "filesystems" : ["ext4", "ntfs"], 109​ "filesystems" : ["ext4", "ntfs"],
▲ Show 20 Lines • Show All 75 Lines • Show Last 20 Lines
View Options

tools/uploads/freeipa.ks

  • This file was added.
1​install
2​cdrom
3​bootloader --location=mbr
4​network --device=link --activate --bootproto=static --ip=10.0.2.100 --netmask=255.255.255.0 --gateway=10.0.2.2 --hostname=ipa001.domain.local
5​lang en_US.UTF-8
6​keyboard us
7​timezone --utc America/New_York
8​clearpart --all
9​autopart
10​%packages
11​@^server-product-environment
12​@freeipa-server
13​# we need this to create the fake repo to make DNF happy for offline deployment
14​createrepo_c
15​%end
16​rootpw anaconda
17​reboot
View Options

tools/uploads/freeipaclient.ks

  • This file was added.
1​install
2​cdrom
3​bootloader --location=mbr
4​network --device=link --activate --bootproto=static --ip=10.0.2.101 --netmask=255.255.255.0 --gateway=10.0.2.2 --hostname=client001.domain.local --nameserver=10.0.2.100
5​lang en_US.UTF-8
6​keyboard us
7​timezone --utc America/New_York
8​clearpart --all
9​autopart
10​%packages
11​@^server-product-environment
12​%end
13​rootpw anaconda
14​reboot
15​realm join --one-time-password=monkeys ipa001.domain.local
View Options

tools/uploads/root-user-crypted-net.ks

  • This file was added.
1​install
2​bootloader --location=mbr
3​network --device=link --activate --bootproto=dhcp
4​url --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch
5​lang en_US.UTF-8
6​keyboard us
7​timezone --utc America/New_York
8​clearpart --all
9​autopart
10​
11​rootpw --iscrypted $6$ansiogjasd0io9u3$9E1vMbLbXW14grtguedFGVjvhyBz1T.KIA3MJl1SWnGbtTpiXIAjbazIQAUKRNkNIEmd3mI0NCkFIVBrN41fZ.
12​user --name=test --password=$6$ansioasgfgadsghd$O8O8zom5hx.V8ib1jV91xuvIgYqA2b99tzhibkk3URITdCrDtbRbwJjMK1kW4l0/9W0brraGC4NUBtDoGv4Kl. --iscrypted
13​
14​reboot
15​
16​%packages
17​@core
18​%end
View Options

tools/uploads/updates.img

  • This binary file was added.