mirrors/crosvm
1
0
Fork 0
mirror of https://chromium.googlesource.com/crosvm/crosvm synced 2025-02-10 12:09:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Kokoro: Fix dry-run merge target

Browse source 
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>
This commit is contained in:
Dennis Kempin 2022-06-06 18:48:52 +00:00
parent e7a35d8f9c
commit 301da40bc5
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ci/kokoro/build-merge-into-chromeos.sh
View file

@ -26,16 +26,20 @@ main() {
fi
# Run git cookie auth daemon to pull git http cookies for this GCE instance.
local gcompute_path="${KOKORO_ARTIFACTS_DIR}/gcompute-tools"
git clone "https://gerrit.googlesource.com/gcompute-tools" "$gcompute_path"
${gcompute_path}/git-cookie-authdaemon
# 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"
./tools/chromeos/merge_bot -v update-merges --is-bot HEAD
./tools/chromeos/merge_bot -v update-dry-runs --is-bot HEAD
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