summary refs log tree commit diff
path: root/kokoro/README.md
diff options
context:
space:
mode:
authorZach Reizner <zachr@google.com>2019-05-02 12:26:24 -0700
committerchrome-bot <chrome-bot@chromium.org>2019-05-15 13:36:19 -0700
commit6868c0a72ffc556fcd9c48006b673f5774d0d35b (patch)
tree5dbf28cc77e65cc3a8acfa4b6bf165260fb7a167 /kokoro/README.md
parent050af40382a5619278fc08eef7dfbde5591abd76 (diff)
downloadcrosvm-6868c0a72ffc556fcd9c48006b673f5774d0d35b.tar
crosvm-6868c0a72ffc556fcd9c48006b673f5774d0d35b.tar.gz
crosvm-6868c0a72ffc556fcd9c48006b673f5774d0d35b.tar.bz2
crosvm-6868c0a72ffc556fcd9c48006b673f5774d0d35b.tar.lz
crosvm-6868c0a72ffc556fcd9c48006b673f5774d0d35b.tar.xz
crosvm-6868c0a72ffc556fcd9c48006b673f5774d0d35b.tar.zst
crosvm-6868c0a72ffc556fcd9c48006b673f5774d0d35b.zip
add docker supported builds and tests
BUG=None
TEST=docker/build_crosvm_base.sh
     docker/build_crosvm.sh
     docker/wrapped_smoke_test.sh
     docker/crosvm_wrapper.sh
     kokoro/kokoro_simulator.sh
     bin/smoke_test

Change-Id: I55a805ba6326c3c58973d1fe21172a5e3551c1e2
Reviewed-on: https://chromium-review.googlesource.com/1593723
Commit-Ready: Zach Reizner <zachr@chromium.org>
Tested-by: Zach Reizner <zachr@chromium.org>
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Dylan Reid <dgreid@chromium.org>
Diffstat (limited to 'kokoro/README.md')
-rw-r--r--kokoro/README.md10
1 files changed, 5 insertions, 5 deletions
diff --git a/kokoro/README.md b/kokoro/README.md
index 70cceb2..727b74a 100644
--- a/kokoro/README.md
+++ b/kokoro/README.md
@@ -3,7 +3,7 @@
 For presubmit testing, each change posted for Gerrit on the master branch of crosvm will be tried by
 Kokoro. The configuration is found in [`presubmit.cfg`](presubmit.cfg) and the build script is at
 [`build.sh`](build.sh). A Docker image called `crosvm-base` is used as the testing environment which
-is built with a [`Dockerfile`](Dockerfile).
+is built with a [`Dockerfile`](../docker/Dockerfile).
 
 [TOC]
 
@@ -12,17 +12,17 @@ is built with a [`Dockerfile`](Dockerfile).
 Assuming a Docker daemon is already running, build the `crosvm-base` image:
 
 ```shell
-docker build -t crosvm-base path/to/crosvm/kokoro
+path/to/crosvm/docker/build_crosvm_base.sh
 ```
 
 Here is how to use the image to test a crosvm repository located at `$CROSVM_SRC`:
 
 ```shell
-docker run --privileged -v /dev/log:/dev/log -v "${CROSVM_SRC}":/platform/crosvm:ro crosvm-base
+$CROSVM_SRC/docker/wrapped_smoke_test.sh
 ```
 
 > **WARNING**:
-> The `--privileged` is so that the container will have `/dev/kvm` access.
+> The `--privileged` flag is used in that script so that the container will have `/dev/kvm` access.
 
 ## How to update `crosvm-base`
 
@@ -32,7 +32,7 @@ If an update or new library is needed or any other adjustment is required, a new
 generated as follows:
 
 ```shell
-docker build -t crosvm-base path/to/crosvm/kokoro
+path/to/crosvm/docker/build_crosvm_base.sh
 docker save crosvm-base | xz -T 0 -z >crosvm-base.tar.xz
 ```