mirror of
https://chromium.googlesource.com/crosvm/crosvm
synced 2025-02-06 02:25:23 +00:00
5156976b7f
To enable the merge bot on luci we had to solve a couple of problems: - We cannot use http cookies for auth, so added gcloud auth into merge_bot. - Switch back to original HEAD after running merge bot. Otherwise the version of the merge_bot script can change between invocations. - Do not soft reset when checking out crosvm source. - For less invasive testing, also added a few more exceptions when using MERGE_BOT_TEST so it won't email, etc. - Rename to update_chromeos_merges, as it is more fitting to what the bot is doing BUG=b:233913643 TEST=https://ci.chromium.org/swarming/task/5b58ed4497fda510 Change-Id: Iaa9b4821b70a1e90d19637d01856196bd7852ed5 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3692686 Reviewed-by: Daniel Verkamp <dverkamp@chromium.org> Tested-by: kokoro <noreply+kokoro@google.com>
36 lines
No EOL
612 B
JSON
36 lines
No EOL
612 B
JSON
[
|
|
{
|
|
"cmd": [
|
|
"vpython3",
|
|
"./tools/chromeos/merge_bot",
|
|
"--verbose",
|
|
"update-merges",
|
|
"--is-bot",
|
|
"origin/main"
|
|
],
|
|
"cwd": "[CACHE]/builder/crosvm",
|
|
"env_prefixes": {
|
|
"MERGE_BOT_TEST": [
|
|
"1"
|
|
]
|
|
},
|
|
"name": "Update Merges"
|
|
},
|
|
{
|
|
"cmd": [
|
|
"vpython3",
|
|
"./tools/chromeos/merge_bot",
|
|
"--verbose",
|
|
"update-dry-runs",
|
|
"--is-bot",
|
|
"origin/main"
|
|
],
|
|
"cwd": "[CACHE]/builder/crosvm",
|
|
"env_prefixes": {
|
|
"MERGE_BOT_TEST": [
|
|
"1"
|
|
]
|
|
},
|
|
"name": "Update Dry Runs"
|
|
}
|
|
] |