mirror of
https://chromium.googlesource.com/crosvm/crosvm
synced 2024-11-24 20:48:55 +00:00
Update cloud storage locations to use crosvm-infra project
See go/crosvm/infra for instructions on how to get access to uploading them. Added a helper script to install dependencies needed to build the guest_under_test. BUG=b:235269312 TEST=Kokoro Change-Id: I78387a33ddbf3ab199b36e76ba617acb1250c7e5 Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/3783011 Reviewed-by: Daniel Verkamp <dverkamp@chromium.org> Commit-Queue: Dennis Kempin <denniskempin@google.com> Tested-by: Dennis Kempin <denniskempin@google.com>
This commit is contained in:
parent
8faf4677bb
commit
1f0b985a4d
7 changed files with 28 additions and 10 deletions
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"image": "gcr.io/crosvm-packages/crosvm_dev:r0014",
|
||||
"image": "gcr.io/crosvm-infra/crosvm_dev:r0014",
|
||||
"extensions": [
|
||||
"rust-lang.rust-analyzer",
|
||||
"bungcip.better-toml",
|
||||
|
|
16
integration_tests/guest_under_test/install_build_deps.sh
Executable file
16
integration_tests/guest_under_test/install_build_deps.sh
Executable file
|
@ -0,0 +1,16 @@
|
|||
#!/bin/bash
|
||||
# Copyright 2022 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.
|
||||
|
||||
# Installs additional dependencies needed to build guest_under_test on debian.
|
||||
|
||||
set -e
|
||||
|
||||
sudo apt install \
|
||||
gcc-aarch64-linux-gnu \
|
||||
qemu-user-static \
|
||||
squashfs-tools-ng \
|
||||
libelf-dev \
|
||||
flex \
|
||||
bison
|
|
@ -14,8 +14,7 @@ set -e
|
|||
cd "${0%/*}"
|
||||
|
||||
readonly PREBUILT_VERSION="$(cat ./PREBUILT_VERSION)"
|
||||
readonly GS_BUCKET="gs://chromeos-localmirror/distfiles"
|
||||
readonly GS_PREFIX="${GS_BUCKET}/crosvm-testing"
|
||||
readonly GS_PREFIX="gs://crosvm/integration_tests/guest"
|
||||
|
||||
function prebuilts_exist_error() {
|
||||
echo "Prebuilts of version ${PREBUILT_VERSION} already exist. See README.md"
|
||||
|
@ -41,8 +40,8 @@ function upload() {
|
|||
make ARCH=${arch} "${local_bzimage}" "${local_rootfs}"
|
||||
|
||||
echo "Uploading files."
|
||||
gsutil cp -n -a public-read "${local_bzimage}" "${remote_bzimage}"
|
||||
gsutil cp -n -a public-read "${local_rootfs}" "${remote_rootfs}"
|
||||
gsutil cp -n "${local_bzimage}" "${remote_bzimage}"
|
||||
gsutil cp -n "${local_rootfs}" "${remote_rootfs}"
|
||||
}
|
||||
|
||||
upload x86_64
|
||||
|
|
|
@ -50,7 +50,7 @@ DOCKER_ARGS = [
|
|||
"--mount type=tmpfs,destination=/tmp",
|
||||
# For plugin process jail
|
||||
"--mount type=tmpfs,destination=/var/empty",
|
||||
f"gcr.io/crosvm-packages/crosvm_dev:{IMAGE_VERSION}",
|
||||
f"gcr.io/crosvm-infra/crosvm_dev:{IMAGE_VERSION}",
|
||||
]
|
||||
|
||||
PODMAN_IS_DEFAULT = shutil.which("docker") == None
|
||||
|
|
|
@ -10,11 +10,14 @@
|
|||
#
|
||||
# make -C tools/impl/dev_container upload
|
||||
#
|
||||
# You need write permission to the crosvm-packages cloud registry to do so.
|
||||
# You need to be a Googler to be able to do so. See go/crosvm/infra for access control and
|
||||
# authenticate via:
|
||||
#
|
||||
# gcloud auth configure-docker gcr.io
|
||||
|
||||
export DOCKER_BUILDKIT=1
|
||||
|
||||
TAG_BASE=gcr.io/crosvm-packages
|
||||
TAG_BASE=gcr.io/crosvm-infra
|
||||
VERSION=$(shell cat version)
|
||||
RUST_VERSION=$(shell cat ../../../rust-toolchain | grep channel | grep -E -o "[0-9\.]+")
|
||||
BUILD_CONTEXT=$(shell realpath ../../../)
|
||||
|
|
|
@ -63,7 +63,7 @@ SRC_DIR = SCRIPT_DIR.joinpath("testvm")
|
|||
ID_RSA = SRC_DIR.joinpath("id_rsa")
|
||||
BASE_IMG_VERSION = open(SRC_DIR.joinpath("version"), "r").read().strip()
|
||||
|
||||
IMAGE_DIR_URL = "https://storage.googleapis.com/crosvm-testvm"
|
||||
IMAGE_DIR_URL = "https://storage.googleapis.com/crosvm/testvm"
|
||||
|
||||
|
||||
def cargo_target_dir():
|
||||
|
|
|
@ -40,7 +40,7 @@ else
|
|||
$(error Only x86_64 or aarch64 are supported)
|
||||
endif
|
||||
|
||||
GS_PREFIX=gs://crosvm-testvm
|
||||
GS_PREFIX=gs://crosvm/testvm
|
||||
DEBIAN_URL=https://cloud.debian.org/images/cloud/bullseye/latest
|
||||
|
||||
BASE_IMG_NAME=base-$(ARCH)-$(shell cat version).qcow2
|
||||
|
|
Loading…
Reference in a new issue