diff --git a/resources/make_test_resources.sh b/resources/make_test_resources.sh index fc9c972d..f1b4d09e 100755 --- a/resources/make_test_resources.sh +++ b/resources/make_test_resources.sh @@ -39,13 +39,10 @@ if [[ $arch = "x86_64" ]]; then $DEST_KERNEL_DIR ./kernel/make_kernel_image_deb.sh -f elf -k vmlinux-focal -w $TMP_DEB_DIR -j $NPROC - ./kernel/make_kernel_image_deb.sh -f elf -k vmlinux-focal -w $TMP_DEB_DIR -j $NPROC -h ./kernel/make_kernel_image_deb.sh -f bzimage -k bzimage-focal -w $TMP_DEB_DIR -j $NPROC - ./kernel/make_kernel_image_deb.sh -f bzimage -k bzimage-focal -w $TMP_DEB_DIR -j $NPROC -h # Same applies to the Ubuntu images. - mv $TMP_DEB_DIR/linux-5.4.81/vmlinux-focal $TMP_DEB_DIR/linux-5.4.81/vmlinux-focal-halt \ - $TMP_DEB_DIR/linux-5.4.81/bzimage-focal $TMP_DEB_DIR/linux-5.4.81/bzimage-focal-halt $DEST_KERNEL_DIR + mv $TMP_DEB_DIR/linux-5.4.81/vmlinux-focal $TMP_DEB_DIR/linux-5.4.81/bzimage-focal $DEST_KERNEL_DIR ./disk/make_rootfs.sh -d $TMP_DEB_DIR/linux-5.4.81/deb/ -w $DEST_DISK_DIR -o ubuntu-focal-rootfs-x86_64.ext4 elif [[ $arch = "aarch64" ]]; then @@ -59,10 +56,9 @@ elif [[ $arch = "aarch64" ]]; then # making debian based image ./kernel/make_kernel_image_deb.sh -f pe -k pe-focal -w $TMP_DEB_DIR -j $NPROC - ./kernel/make_kernel_image_deb.sh -f pe -k pe-focal -w $TMP_DEB_DIR -j $NPROC -h # move them to correct folder - mv $TMP_DEB_DIR/linux-5.4.81/pe-focal $TMP_DEB_DIR/linux-5.4.81/pe-focal-halt $DEST_KERNEL_DIR + mv $TMP_DEB_DIR/linux-5.4.81/pe-focal $DEST_KERNEL_DIR ./disk/make_rootfs.sh -d $TMP_DEB_DIR/linux-5.4.81/deb/ -w $DEST_DISK_DIR -o ubuntu-focal-rootfs-aarch64.ext4 diff --git a/tests/tools/s3/resource_manifest.json b/tests/tools/s3/resource_manifest.json index 9a98bbb0..4440eced 100644 --- a/tests/tools/s3/resource_manifest.json +++ b/tests/tools/s3/resource_manifest.json @@ -331,26 +331,6 @@ "platform_type": "x86_64", "distro": "Ubuntu" }, - { - "resource_type": "kernel", - "resource_name": "bzimage-focal-halt", - "relative_path": "kernel/", - "image_format": "bzimage", - "halt_after_boot": false, - "with_disk": true, - "platform_type": "x86_64", - "distro": "Ubuntu" - }, - { - "resource_type": "kernel", - "resource_name": "vmlinux-focal-halt", - "relative_path": "kernel/", - "image_format": "elf", - "halt_after_boot": false, - "with_disk": true, - "platform_type": "x86_64", - "distro": "Ubuntu" - }, { "resource_type": "kernel", "resource_name": "pe-focal", @@ -361,16 +341,6 @@ "platform_type": "aarch64", "distro": "Ubuntu" }, - { - "resource_type": "kernel", - "resource_name": "pe-focal-halt", - "relative_path": "kernel/", - "image_format": "pe", - "halt_after_boot": true, - "with_disk": true, - "platform_type": "aarch64", - "distro": "Ubuntu" - }, { "resource_type": "disk", "resource_name": "ubuntu-focal-rootfs-aarch64.ext4",