From 9151130e4d4cf9a546ddf75d255d91847b9c7831 Mon Sep 17 00:00:00 2001 From: Zihan Chen Date: Tue, 8 Aug 2023 14:04:43 -0700 Subject: [PATCH] e2e_tests: Update guest kernel config and initramfs As I'm tinkering with the first real benchmark (pgbench), a few kernel configs are found to be missing to support psql to run in e2e test guests. Among with previously added but not uprev-ed KConfig changes, an uprev is prepared. Initramfs script is also updated to match distribution behavior. TEST=locally can pass postgres e2e benchmark BUG=b:257303497 Change-Id: I69b44e3156d3296cbef7fa41804e8b54e4aaf0ab Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/4761848 Reviewed-by: Dennis Kempin Commit-Queue: Zihan Chen --- e2e_tests/guest_under_test/PREBUILT_VERSION | 2 +- e2e_tests/guest_under_test/initramfs/init.sh | 1 + e2e_tests/guest_under_test/kernel/common.config | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/e2e_tests/guest_under_test/PREBUILT_VERSION b/e2e_tests/guest_under_test/PREBUILT_VERSION index 5aed675d3a..fa0363b794 100644 --- a/e2e_tests/guest_under_test/PREBUILT_VERSION +++ b/e2e_tests/guest_under_test/PREBUILT_VERSION @@ -1 +1 @@ -r0007 +r0008 diff --git a/e2e_tests/guest_under_test/initramfs/init.sh b/e2e_tests/guest_under_test/initramfs/init.sh index 21f0529cf2..48ead0008c 100644 --- a/e2e_tests/guest_under_test/initramfs/init.sh +++ b/e2e_tests/guest_under_test/initramfs/init.sh @@ -18,6 +18,7 @@ mkdir -p /newroot/proc /newroot/sys /newroot/dev || true mount --move /sys /newroot/sys mount --move /proc /newroot/proc mount --move /dev /newroot/dev +ln -sf /proc/self/fd /newroot/dev/fd cp /bin/delegate /newroot/bin/delegate || true diff --git a/e2e_tests/guest_under_test/kernel/common.config b/e2e_tests/guest_under_test/kernel/common.config index e64d0b9490..6fc10d9562 100644 --- a/e2e_tests/guest_under_test/kernel/common.config +++ b/e2e_tests/guest_under_test/kernel/common.config @@ -9,6 +9,8 @@ CONFIG_DEVTMPFS_MOUNT=y CONFIG_CGROUPS=y CONFIG_UNIX=y CONFIG_UNIX_SCM=y +CONFIG_SHMEM=y +CONFIG_SYSVIPC=y # Virtio devices CONFIG_VIRTIO_VSOCKETS=y