mirror of
https://chromium.googlesource.com/crosvm/crosvm
synced 2025-02-05 02:02:52 +00:00
301da40bc5
Using HEAD for both calls will cause update-dry-runs to use the merge branch as a target to do the merge, creating the dry run on top of the merge. BUG=None TEST=./ci/kokoro/simulate.py ./ci/kokoro/build-merge-into-chromeos.sh Change-Id: Ib466272d3acce30888e1e3c5db853be9ded46106 Change-Id: Ifc40ffb81a61a75326b296419a4337c49a8fd7db Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3688803 Tested-by: kokoro <noreply+kokoro@google.com> Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
45 lines
1.5 KiB
Bash
Executable file
45 lines
1.5 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.
|
|
set -e
|
|
|
|
# Python script to check for at least version 3.9
|
|
VERSION_CHECK="
|
|
import sys
|
|
sys.exit(sys.version_info.major != 3 or sys.version_info.minor < 9)
|
|
"
|
|
|
|
main() {
|
|
cd "${KOKORO_ARTIFACTS_DIR}/git/crosvm"
|
|
|
|
# Ensure we have at least python 3.9. Kokoro does not and requires us to use pyenv to install
|
|
# The required version.
|
|
if ! python3 -c "$VERSION_CHECK"; then
|
|
pyenv install --verbose --skip-existing 3.9.5
|
|
pyenv global 3.9.5
|
|
fi
|
|
|
|
# Extra packages required by merge_bot
|
|
if ! pip show argh; then
|
|
pip install argh
|
|
fi
|
|
|
|
# Run git cookie auth daemon to pull git http cookies for this GCE instance.
|
|
# Don't do this if a cookie already exists, which allow us to test this script locally.
|
|
if ! git config http.cookiefile; then
|
|
local gcompute_path="${KOKORO_ARTIFACTS_DIR}/gcompute-tools"
|
|
git clone "https://gerrit.googlesource.com/gcompute-tools" "$gcompute_path"
|
|
${gcompute_path}/git-cookie-authdaemon
|
|
fi
|
|
|
|
# Overwrite kokoro default with service account we are actually using to submit code.
|
|
git config user.name "Crosvm Bot"
|
|
git config user.email "crosvm-bot@crosvm-packages.iam.gserviceaccount.com"
|
|
|
|
local target_rev=$(git rev-parse HEAD)
|
|
./tools/chromeos/merge_bot -v update-merges --is-bot "$target_rev"
|
|
./tools/chromeos/merge_bot -v update-dry-runs --is-bot "$target_rev"
|
|
}
|
|
|
|
main
|