Update root-user-crypted-net kickstart usages

Use the copy in the group dir (not jskladan's), which I've fixed
to not use "install" any more.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2021-01-19 15:03:48 -08:00
parent 014492cbc5
commit 7631dd3c4d
2 changed files with 3 additions and 3 deletions

View File

@ -1172,7 +1172,7 @@
"fedora-universal-x86_64-*-64bit": 20 "fedora-universal-x86_64-*-64bit": 20
}, },
"settings": { "settings": {
"GRUB": "inst.ks=http://jskladan.fedorapeople.org/kickstarts/root-user-crypted-net.ks", "GRUB": "inst.ks=https://fedorapeople.org/groups/qa/kickstarts/root-user-crypted-net.ks",
"KICKSTART": "1", "KICKSTART": "1",
"ROOT_PASSWORD": "111111", "ROOT_PASSWORD": "111111",
"USER_LOGIN": "test", "USER_LOGIN": "test",

View File

@ -80,7 +80,7 @@ sub _pxe_setup {
assert_script_run "curl -o /var/lib/tftpboot/fedora/initrd.img $location/Everything/${arch}/os/${kernpath}/initrd.img"; assert_script_run "curl -o /var/lib/tftpboot/fedora/initrd.img $location/Everything/${arch}/os/${kernpath}/initrd.img";
# get a kickstart to embed in the initramfs, for testing: # get a kickstart to embed in the initramfs, for testing:
# https://fedoraproject.org/wiki/QA:Testcase_Kickstart_File_Path_Ks_Cfg # https://fedoraproject.org/wiki/QA:Testcase_Kickstart_File_Path_Ks_Cfg
assert_script_run "curl -o ks.cfg https://jskladan.fedorapeople.org/kickstarts/root-user-crypted-net.ks"; assert_script_run "curl -o ks.cfg https://fedorapeople.org/groups/qa/kickstarts/root-user-crypted-net.ks";
# tweak the repo config in it # tweak the repo config in it
assert_script_run "sed -i -e 's,^url.*,nfs --server 172.16.2.110 --dir /repo --opts nfsvers=4,g' ks.cfg"; assert_script_run "sed -i -e 's,^url.*,nfs --server 172.16.2.110 --dir /repo --opts nfsvers=4,g' ks.cfg";
# embed it # embed it
@ -127,7 +127,7 @@ sub run {
# create the file share # create the file share
assert_script_run "mkdir -p /export"; assert_script_run "mkdir -p /export";
# get the kickstart # get the kickstart
assert_script_run "curl -o /export/root-user-crypted-net.ks https://jskladan.fedorapeople.org/kickstarts/root-user-crypted-net.ks"; assert_script_run "curl -o /export/root-user-crypted-net.ks https://fedorapeople.org/groups/qa/kickstarts/root-user-crypted-net.ks";
# for update tests, set up the update repository and export it # for update tests, set up the update repository and export it
if (get_var("ADVISORY_OR_TASK")) { if (get_var("ADVISORY_OR_TASK")) {
assert_script_run "echo '/opt/update_repo 172.16.2.0/24(ro)' >> /etc/exports"; assert_script_run "echo '/opt/update_repo 172.16.2.0/24(ro)' >> /etc/exports";