From 7631dd3c4d207a2520356c1fe2ae729791e025b5 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 19 Jan 2021 15:03:48 -0800 Subject: [PATCH] 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 --- templates.fif.json | 2 +- tests/_support_server.pm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/templates.fif.json b/templates.fif.json index b864b2ba..cfa0873a 100644 --- a/templates.fif.json +++ b/templates.fif.json @@ -1172,7 +1172,7 @@ "fedora-universal-x86_64-*-64bit": 20 }, "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", "ROOT_PASSWORD": "111111", "USER_LOGIN": "test", diff --git a/tests/_support_server.pm b/tests/_support_server.pm index c37ed523..e752b6ed 100644 --- a/tests/_support_server.pm +++ b/tests/_support_server.pm @@ -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"; # get a kickstart to embed in the initramfs, for testing: # 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 assert_script_run "sed -i -e 's,^url.*,nfs --server 172.16.2.110 --dir /repo --opts nfsvers=4,g' ks.cfg"; # embed it @@ -127,7 +127,7 @@ sub run { # create the file share assert_script_run "mkdir -p /export"; # 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 if (get_var("ADVISORY_OR_TASK")) { assert_script_run "echo '/opt/update_repo 172.16.2.0/24(ro)' >> /etc/exports";