From df7a2e51bf8dfdacb7555ada00f2949c8be734f9 Mon Sep 17 00:00:00 2001 From: Ryuichiro Chiba Date: Mon, 24 Oct 2022 15:59:15 +0900 Subject: [PATCH] e2e_tests: Add a tool to dev_container and guest rootfs Add a tool used in vsock tests to dev_container and guest rootfs BUG=b:254375643 TEST=`./tools/presubmit` with the new guest rootfs on the new dev_container Change-Id: I135e6d2d413bedffef0fd69edd4ab14080429e3a Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/3974349 Reviewed-by: Dennis Kempin Reviewed-by: Takaya Saeki Commit-Queue: Ryuichiro Chiba Reviewed-by: Keiichi Watanabe --- e2e_tests/README.md | 7 ++++--- e2e_tests/guest_under_test/Dockerfile | 4 ++-- e2e_tests/guest_under_test/PREBUILT_VERSION | 2 +- tools/impl/dev_container/entrypoint.sh | 5 +++++ tools/impl/dev_container/version | 2 +- tools/install-deps | 1 + 6 files changed, 14 insertions(+), 7 deletions(-) diff --git a/e2e_tests/README.md b/e2e_tests/README.md index 82dbf67235..c54f9ea929 100644 --- a/e2e_tests/README.md +++ b/e2e_tests/README.md @@ -20,7 +20,8 @@ Note: Only Googlers with access to the crosvm-testing cloud storage bin can uplo To upload the modified rootfs, you will have to uprev the `PREBUILT_VERSION` variable in: - `./guest_under_test/PREBUILT_VERSION` -- `src/third_party/chromiumos-overlay/chromeos-base/crosvm/crosvm-9999.ebuild` -Then run the upload script to build and upload the new prebuilts. **Never** try to modify an -existing prebuilt as the new images may break tests in older versions. +and [request a permission](http://go/crosvm/infra.md?cl=head#access-on-demand-to-upload-artifacts) +to become a member of the `crosvm-policy-uploader` group. Then run the upload script to build and +upload the new prebuilts. **Never** try to modify an existing prebuilt as the new images may break +tests in older versions. diff --git a/e2e_tests/guest_under_test/Dockerfile b/e2e_tests/guest_under_test/Dockerfile index 89c79b79fe..3cf26a9736 100644 --- a/e2e_tests/guest_under_test/Dockerfile +++ b/e2e_tests/guest_under_test/Dockerfile @@ -2,9 +2,9 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. ARG ARCH -FROM ${ARCH}/alpine:3.12 +FROM ${ARCH}/alpine:3.16 -RUN apk add --no-cache pciutils +RUN apk add --no-cache pciutils nmap-ncat # Note: This docker file is run from the $(target)/rootfs directory specified in # the Makefile. diff --git a/e2e_tests/guest_under_test/PREBUILT_VERSION b/e2e_tests/guest_under_test/PREBUILT_VERSION index 75d30fb532..9742708e66 100644 --- a/e2e_tests/guest_under_test/PREBUILT_VERSION +++ b/e2e_tests/guest_under_test/PREBUILT_VERSION @@ -1 +1 @@ -r0001 +r0002 diff --git a/tools/impl/dev_container/entrypoint.sh b/tools/impl/dev_container/entrypoint.sh index 3395f40cf6..e9d9cf4595 100755 --- a/tools/impl/dev_container/entrypoint.sh +++ b/tools/impl/dev_container/entrypoint.sh @@ -11,6 +11,11 @@ if [ -e "/dev/kvm" ]; then chmod 666 /dev/kvm fi +# Give a vhost device correct permission +if [ -e "/dev/vhost-vsock" ]; then + chmod 666 /dev/vhost-vsock +fi + # Run provided command or interactive shell if [[ $# -eq 0 ]]; then sudo -u crosvmdev /bin/bash -l diff --git a/tools/impl/dev_container/version b/tools/impl/dev_container/version index 2d2fa70588..13124a348f 100644 --- a/tools/impl/dev_container/version +++ b/tools/impl/dev_container/version @@ -1 +1 @@ -r0030 +r0031 diff --git a/tools/install-deps b/tools/install-deps index f96e39bd06..da5fe86ff6 100755 --- a/tools/install-deps +++ b/tools/install-deps @@ -34,6 +34,7 @@ sudo apt-get install --yes --no-install-recommends \ make \ mold \ nasm \ + ncat \ ninja-build \ openssh-client \ pkg-config \