mirror of
https://chromium.googlesource.com/crosvm/crosvm
synced 2024-10-25 05:35:41 +00:00
4d2253b529
This CL fixes some of the issues that prevented the test system from running on other workstations. - Builders run by Kokoro will not use a scratch mount. It's not needed, and will cause issues if stored on /tmp with noexec set. - Running podman with label=disable to prevent selinux issues. The run_tests implementation has been moved to a separate file and updated with parsing of cargo test output. This allows simpler test output and integration with the test results UI in sponge. The sponge test UI can make it much easier to see which tests failed, and to find the log of that test case. This CL also includes an ./ci/kokoro/uprev script to uprev the manifest versions. And runs the uprev. BUG=b:174861002 TEST=Tested by forcing a kokoro build with this CL Change-Id: I0cba9bb68915e2558a4ea6061dd9ba0a7050421b Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/2669712 Reviewed-by: Zach Reizner <zachr@chromium.org> Tested-by: kokoro <noreply+kokoro@google.com> Tested-by: Dennis Kempin <denniskempin@google.com> Commit-Queue: Dennis Kempin <denniskempin@google.com>
81 lines
2.3 KiB
Bash
Executable file
81 lines
2.3 KiB
Bash
Executable file
#!/bin/bash
|
|
# Copyright 2021 The Chromium OS Authors. All rights reserved.
|
|
# Use of this source code is governed by a BSD-style license that can be
|
|
# found in the LICENSE file.
|
|
#
|
|
# Runs a crosvm builder. Will use podman if available, falls back to docker.
|
|
# Usage:
|
|
# run_container.sh builder_name entry point args...
|
|
#
|
|
# The scratch or logs directory can be enabled by setting the env variables
|
|
# CROSVM_BUILDER_SCRATCH_DIR or CROSVM_BUILDER_LOGS_DIR.
|
|
|
|
crosvm_root=$(realpath "$(dirname $0)/..")
|
|
cros_root=$(realpath "${crosvm_root}/../../..")
|
|
|
|
if [ ! -d "${cros_root}/.repo" ]; then
|
|
echo "The CI builder must be run from a cros checkout. See ci/README.md"
|
|
exit 1
|
|
fi
|
|
|
|
# Parse parameters
|
|
builder="$1"
|
|
shift
|
|
|
|
# User podman if available for root-less execution. Fall-back to docker.
|
|
if which podman >/dev/null; then
|
|
run() {
|
|
# The run.oci.keep_original_groups flag allows us to access devices to
|
|
# which the calling user only has access via a group membership (i.e.
|
|
# /dev/kvm). See: https://github.com/containers/podman/issues/4477
|
|
podman run \
|
|
--runtime /usr/bin/crun \
|
|
--annotation run.oci.keep_original_groups=1 \
|
|
--security-opt label=disable \
|
|
"$@"
|
|
}
|
|
else
|
|
run() {
|
|
docker run "$@"
|
|
}
|
|
fi
|
|
|
|
version=$(cat $(dirname $0)/image_tag)
|
|
echo "Using builder: ${builder}:${version}"
|
|
|
|
src="${cros_root}/src"
|
|
echo "Using source directory: ${src} (Available at /workspace/src)"
|
|
|
|
docker_args=(
|
|
--rm
|
|
--device /dev/kvm
|
|
--volume /dev/log:/dev/log
|
|
--volume "${src}":/workspace/src:rw
|
|
)
|
|
|
|
if [ ! -z "${CROSVM_BUILDER_SCRATCH_DIR}" ]; then
|
|
echo "Using scratch directory: ${CROSVM_BUILDER_SCRATCH_DIR}\
|
|
(Available at /workspace/scratch)"
|
|
mkdir -p "${CROSVM_BUILDER_SCRATCH_DIR}"
|
|
docker_args+=(
|
|
--volume "${CROSVM_BUILDER_SCRATCH_DIR}:/workspace/scratch:rw"
|
|
)
|
|
fi
|
|
|
|
if [ ! -z "${CROSVM_BUILDER_LOGS_DIR}" ]; then
|
|
echo "Using logs directory: ${CROSVM_BUILDER_LOGS_DIR}\
|
|
(Available at /workspace/logs)"
|
|
mkdir -p "${CROSVM_BUILDER_LOGS_DIR}"
|
|
docker_args+=(--volume "${CROSVM_BUILDER_LOGS_DIR}":/workspace/logs:rw)
|
|
fi
|
|
|
|
# Enable interactive mode when running in an interactive terminal.
|
|
if [ -t 1 ]; then
|
|
docker_args+=(-it)
|
|
fi
|
|
|
|
echo ""
|
|
run ${docker_args[@]} \
|
|
"gcr.io/crosvm-packages/${builder}:${version}" \
|
|
"$@"
|