[Why] Vmlinuz, initrd, reboot.cgz is all that is required for firstboot after ISO is installed. Therefore, the original os_mount=local is changed to custom_ipxe to obtain the ipxe response.

Signed-off-by: Yu Chuan 13186087857@163.com --- jobs/install-iso-firstboot.yaml | 9 +-------- tests/install-iso-pre | 14 +++++++++----- 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/jobs/install-iso-firstboot.yaml b/jobs/install-iso-firstboot.yaml index 7be9eaaab184..c170b8a07f8a 100644 --- a/jobs/install-iso-firstboot.yaml +++ b/jobs/install-iso-firstboot.yaml @@ -1,10 +1,3 @@ suite: install-iso-firstboot

-sleep: 1 - -# os_mount must be equal to 'local' -os_mount: local - -# kernel_custom_params must have 'boot_lv_suffix' and 'src_lv_suffix', -# and they must be the same. so can boot from the specify logical volume -kernel_custom_params: +custom_ipxe: diff --git a/tests/install-iso-pre b/tests/install-iso-pre index 768ffb2cca45..c89895a994cc 100755 --- a/tests/install-iso-pre +++ b/tests/install-iso-pre @@ -225,14 +225,18 @@ submit_install_iso_firstboot_yaml() local firstboot_yaml="${LKP_SRC}/jobs/install-iso-firstboot.yaml" [ -f "${firstboot_yaml}" ] || die "cannot find ${firstboot_yaml}"

+ custom_ipxe="#!ipxe\\n" + custom_ipxe="${custom_ipxe}\\ndhcp" + custom_ipxe="${custom_ipxe}\\ninitrd http://$%7BOS_HTTP_HOST%7D:$%7BOS_HTTP_PORT%7D/os/$%7Biso_os%7D/$%7Biso_arch..." + custom_ipxe="${custom_ipxe}\\ninitrd http://$%7BINITRD_HTTP_HOST%7D:$%7BINITRD_HTTP_PORT%7D/initrd/custom_bootstr..." + custom_ipxe="${custom_ipxe}\\nkernel http://$%7BOS_HTTP_HOST%7D:$%7BOS_HTTP_PORT%7D/os/$%7Biso_os%7D/$%7Biso_arch... ip=dhcp root=/dev/mapper/os-${iso_os}_${iso_arch}_${iso_version}_${ROOTFS_SUFFIX} initrd=initrd.lkp initrd=reboot.cgz local rw" + custom_ipxe="${custom_ipxe}\\nboot\\n" + + sed -i "/custom_ipxe:/ccustom_ipxe: "${custom_ipxe}"" $firstboot_yaml + ${LKP_SRC}/sbin/submit \ ${firstboot_yaml} \ suite=install-iso-firstboot-${ROOTFS_SUFFIX} \ - os=${iso_os} \ - os_arch=${iso_arch} \ - os_version=${iso_version} \ - os_mount=local \ - kernel_custom_params="src_lv_suffix=${ROOTFS_SUFFIX} boot_lv_suffix=${ROOTFS_SUFFIX}" \ testbox=$testbox || die "submit ${firstboot_yaml} failed" }