diff options
author | Dennis Kempin <denniskempin@google.com> | 2021-04-20 11:51:57 -0700 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2021-04-21 04:51:34 +0000 |
commit | 98d2f0294bbaa47dd15d832103e5a1e4b840bd3a (patch) | |
tree | 4561d31937c68d9169b015f406d968882f8327e1 | |
parent | 82561b445b3231464d55503024b1f6cb86fbbec7 (diff) | |
download | crosvm-98d2f0294bbaa47dd15d832103e5a1e4b840bd3a.tar.gz |
Kokoro: Always build against ToT instead of a fixed manifest
This will introduce a little instability into our test infrastructure
since tests will no longer be hermetic, but build against the latest
ToT version of our chromeos dependencies.
It will however, make our day-to-day workflows a lot easier. A lot of
changes are made across repository boundaries and require
annoying extra steps since Kokoro does not understand Cq-Depend.
BUG=b:185917395
TEST=./ci/kokoro/simulate_all passes
Change-Id: I3c3cae20d418574a3db53cc74d81245b87c228db
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/2840057
Tested-by: kokoro <noreply+kokoro@google.com>
Commit-Queue: Dennis Kempin <denniskempin@google.com>
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
-rwxr-xr-x | ci/kokoro/common.sh | 10 | ||||
-rw-r--r-- | ci/kokoro/manifest.xml | 25 | ||||
-rwxr-xr-x | ci/kokoro/uprev | 30 |
3 files changed, 6 insertions, 59 deletions
diff --git a/ci/kokoro/common.sh b/ci/kokoro/common.sh index 744517d4f..c1e1e8b3b 100755 --- a/ci/kokoro/common.sh +++ b/ci/kokoro/common.sh @@ -12,9 +12,11 @@ crosvm_root="${KOKORO_ARTIFACTS_DIR}"/git/crosvm # Note: Access is restricted to the google corporate network. # Details: https://yaqs.corp.google.com/eng/q/6628551334035456 if [[ ! -z "${DEBUG_SSH_KEY}" ]]; then - echo "${DEBUG_SSH_KEY}" >> ~/.ssh/authorized_keys - external_ip=$(curl -s -H "Metadata-Flavor: Google" - http://metadata/computeMetadata/v1/instance/network-interfaces/0/access-configs/0/external-ip) + echo "${DEBUG_SSH_KEY}" >>~/.ssh/authorized_keys + external_ip=$( + curl -s -H "Metadata-Flavor: Google" + http://metadata/computeMetadata/v1/instance/network-interfaces/0/access-configs/0/external-ip + ) echo "SSH Debug enabled. Connect to: kbuilder@${external_ip}" fi @@ -43,7 +45,7 @@ setup_source() { -u https://chromium.googlesource.com/chromiumos/manifest.git \ --repo-url https://chromium.googlesource.com/external/repo.git \ -g crosvm || return 1 - ./repo sync -j8 -c -m "${crosvm_root}/ci/kokoro/manifest.xml" || return 1 + ./repo sync -j8 -c || return 1 # Bind mount source into cros checkout. echo "" diff --git a/ci/kokoro/manifest.xml b/ci/kokoro/manifest.xml deleted file mode 100644 index 7848120a6..000000000 --- a/ci/kokoro/manifest.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<manifest> - <remote name="aosp" fetch="https://android.googlesource.com" review="https://android-review.googlesource.com"/> - <remote name="chromium" fetch="https://chromium.googlesource.com/" alias="cros"/> - <remote name="cros" fetch="https://chromium.googlesource.com" review="https://chromium-review.googlesource.com"/> - - <default remote="cros" revision="refs/heads/main" sync-j="8"/> - - <project name="chromiumos/chromite" path="chromite" revision="28286c2e309f094fb1a57673b8eac8facf1a8f0e" upstream="refs/heads/main" dest-branch="refs/heads/main" groups="minilayout,firmware,buildtools,chromeos-admin,labtools,sysmon,devserver,crosvm"> - <copyfile src="AUTHORS" dest="AUTHORS"/> - <copyfile src="LICENSE" dest="LICENSE"/> - </project> - <project name="chromiumos/docs" path="docs" revision="e0bd4388ac29069b7999225d4946bc6d92e6803f" upstream="refs/heads/main" dest-branch="refs/heads/main" groups="crosvm"/> - <project name="chromiumos/platform/crosvm" path="src/platform/crosvm" revision="d78d05bf7fc0df39da69df04eecad75f75b6af5c" upstream="refs/heads/main" dest-branch="refs/heads/main" groups="crosvm"/> - <project name="chromiumos/platform/minigbm" path="src/platform/minigbm" revision="f2dc08e5a43faa536bb9ef774837a64eb489a301" upstream="refs/heads/main" dest-branch="refs/heads/main" groups="crosvm"/> - <project name="chromiumos/platform2" path="src/platform2" revision="e7023d4310c9503244a594d16799f28c811e06da" upstream="refs/heads/main" dest-branch="refs/heads/main" groups="crosvm"/> - <project name="chromiumos/repohooks" path="src/repohooks" revision="00c74ba0feedd019af7be3dd0287542e051ad614" upstream="refs/heads/main" dest-branch="refs/heads/main" groups="minilayout,firmware,buildtools,labtools,crosvm"/> - <project name="chromiumos/third_party/adhd" path="src/third_party/adhd" revision="46a3cdb70137e1ea49235fa1c20d952747e3c8ba" upstream="refs/heads/main" dest-branch="refs/heads/main" groups="crosvm"/> - <project name="chromiumos/third_party/rust-vmm/vhost" path="src/third_party/rust-vmm/vhost" revision="98298cb96972c20e05bffed58861456b48328d43" upstream="refs/heads/main" dest-branch="refs/heads/main" groups="crosvm"/> - <project name="chromiumos/third_party/tpm2" path="src/third_party/tpm2" revision="6003a4d22289f86814155b867319e3611a8ebcbc" upstream="refs/heads/main" dest-branch="refs/heads/main" groups="firmware,crosvm"/> - <project name="chromiumos/third_party/virglrenderer" path="src/third_party/virglrenderer" revision="5e2d10463d6b79080c3376138221b73ea6e95186" upstream="refs/heads/master" dest-branch="refs/heads/master" groups="crosvm"/> - <project name="platform/external/minijail" path="src/aosp/external/minijail" remote="aosp" revision="c71826854946d4f24e23304b63aab0f2c1639932" upstream="refs/heads/master" dest-branch="refs/heads/master" groups="crosvm"/> - - <repo-hooks in-project="chromiumos/repohooks" enabled-list="pre-upload"/> -</manifest> diff --git a/ci/kokoro/uprev b/ci/kokoro/uprev deleted file mode 100755 index 515f84f5a..000000000 --- a/ci/kokoro/uprev +++ /dev/null @@ -1,30 +0,0 @@ -#!/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. -# -# Uprevs manifest.xml to the latest versions. -# -# This is just a wrapper around `repo manifest`. Usually we have unsubmitted -# CLs in our local repo, so it's safer to pull the latest manifest revisions -# from a fresh repo checkout to make sure all commit sha's are available. - -tmp=$(mktemp -d) -manifest_path=$(realpath $(dirname $0)/manifest.xml) - -cleanup() { - rm -rf "${tmp}" -} - -main() { - cd "${tmp}" - repo init --depth 1 \ - -u https://chromium.googlesource.com/chromiumos/manifest.git \ - --repo-url https://chromium.googlesource.com/external/repo.git \ - -g crosvm - repo sync -j8 -c - repo manifest --revision-as-HEAD -o "${manifest_path}" -} - -trap cleanup EXIT -main "$@" |