kokoro: Move the crosvm workdir

After trying symlinks and bind-mounts and various other shenanigans,
give up and move the crosvm working directory to a relative path that is
the same as in the chrome OS chroot.

This allows other crates in the cros checkout to find the crosvm crates
they depend on.

Signed-off-by: Dylan Reid <dgreid@chromium.org>
Change-Id: I643497f08c59328e02775ad3ac0ef9feafbf2930
Reviewed-on: https://chromium-review.googlesource.com/1436595
Commit-Ready: Chih-Yang Hsia <paulhsia@chromium.org>
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Chih-Yang Hsia <paulhsia@chromium.org>
Reviewed-by: Zach Reizner <zachr@chromium.org>

3 files changed, 6 insertions, 9 deletions

diff --git a/kokoro/Dockerfile b/kokoro/Dockerfile
index 30590dd..43fa508 100644
--- a/kokoro/Dockerfile
+++ b/kokoro/Dockerfile
@@ -4,7 +4,7 @@
 
 FROM debian:stretch
 LABEL description="Test crosvm using a command like the following: \
-docker run --privileged -v /dev/log:/dev/log -v <path to crosvm>:/src:ro <crosvm base image>"
+docker run --privileged -v /dev/log:/dev/log -v <path to crosvm>:/platform/crosvm:ro <crosvm base image>"
 
 RUN apt-get update && apt-get install -y \
     autoconf \
@@ -116,17 +116,14 @@ RUN mkdir -p $THIRD_PARTY_ROOT
 ENV PLATFORM_ROOT=$CROS_ROOT/platform
 RUN mkdir -p $PLATFORM_ROOT
 
-# Allow other crates to depend on crosvm provided crates by linking to the
-# crosvm source from a relative path.
-RUN ln -s /src $PLATFORM_ROOT/crosvm
-
 # Pull the cras library for audio access.
 RUN git clone https://chromium.googlesource.com/chromiumos/third_party/adhd $THIRD_PARTY_ROOT/adhd
 
-# The /build directory is used so that the bind mounted /src volume does not get scribbled on.
+# The /build directory is used so that the bind mounted /platform/crosvm volume
+# does not get scribbled on.
 ENV CARGO_TARGET_DIR=/build
 RUN mkdir -p $CARGO_TARGET_DIR
-WORKDIR /src
+WORKDIR /platform/crosvm
 CMD cargo --version && rustc --version && rustfmt --version && \
     echo "Running cargo test" && \
     cargo test --no-fail-fast --all-features --all --exclude aarch64 $TEST_FLAGS -- \
diff --git a/kokoro/README.md b/kokoro/README.md
index 201ab54..70cceb2 100644
--- a/kokoro/README.md
+++ b/kokoro/README.md
@@ -18,7 +18,7 @@ docker build -t crosvm-base path/to/crosvm/kokoro
 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}":/src:ro crosvm-base
+docker run --privileged -v /dev/log:/dev/log -v "${CROSVM_SRC}":/platform/crosvm:ro crosvm-base
 ```
 
 > **WARNING**:
diff --git a/kokoro/build.sh b/kokoro/build.sh
index 0ee3a02..e78d9c7 100755
--- a/kokoro/build.sh
+++ b/kokoro/build.sh
@@ -23,7 +23,7 @@ main() {
     --privileged \
     -e TEST_RUNNER_FLAGS='--format terse' \
     -v /dev/log:/dev/log \
-    -v "${src_root}":/src:ro \
+    -v "${src_root}":/platform/crosvm:ro \
     ${base_image}
 
   return 0