mirror of
https://chromium.googlesource.com/crosvm/crosvm
synced 2025-02-09 03:57:24 +00:00
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 <denniskempin@google.com> Reviewed-by: Takaya Saeki <takayas@chromium.org> Commit-Queue: Ryuichiro Chiba <chibar@chromium.org> Reviewed-by: Keiichi Watanabe <keiichiw@chromium.org>
This commit is contained in:
parent
befb1ccaa9
commit
df7a2e51bf
6 changed files with 14 additions and 7 deletions
|
@ -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.
|
||||
|
|
|
@ -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.
|
||||
|
|
|
@ -1 +1 @@
|
|||
r0001
|
||||
r0002
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -1 +1 @@
|
|||
r0030
|
||||
r0031
|
||||
|
|
|
@ -34,6 +34,7 @@ sudo apt-get install --yes --no-install-recommends \
|
|||
make \
|
||||
mold \
|
||||
nasm \
|
||||
ncat \
|
||||
ninja-build \
|
||||
openssh-client \
|
||||
pkg-config \
|
||||
|
|
Loading…
Reference in a new issue