aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Dole <adriandole@google.com>2022-08-31 18:25:52 +0000
committerChromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com>2022-08-31 20:12:16 +0000
commita077084e5356ed2074d4fa76b4333b76ccd1a26e (patch)
treeabcbf2c475272d49dd014824b7fae8e6ac696418
parent0abb0b34ef29c06f20208f7bc28040868169b0c1 (diff)
downloadtoolchain-utils-a077084e5356ed2074d4fa76b4333b76ccd1a26e.tar.gz
toolchain_utils: fix uses of UpdatePackages
BUG=b:243897875 TEST=./modify_a_tryjob_unittest.py && ./update_packages_and_run_tests_unittest.py Change-Id: I46bb7577134134e44e5f0571261031475ebdef7d Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/toolchain-utils/+/3867948 Auto-Submit: Adrian Dole <adriandole@google.com> Tested-by: Adrian Dole <adriandole@google.com> Commit-Queue: Adrian Dole <adriandole@google.com> Reviewed-by: Jordan Abrahams-Whitehead <ajordanr@google.com> Reviewed-by: Adrian Dole <adriandole@google.com>
-rwxr-xr-xllvm_tools/modify_a_tryjob.py15
-rwxr-xr-xllvm_tools/update_packages_and_run_tests.py15
2 files changed, 16 insertions, 14 deletions
diff --git a/llvm_tools/modify_a_tryjob.py b/llvm_tools/modify_a_tryjob.py
index bed99933..53f783ba 100755
--- a/llvm_tools/modify_a_tryjob.py
+++ b/llvm_tools/modify_a_tryjob.py
@@ -114,13 +114,14 @@ def GetCLAfterUpdatingPackages(packages, git_hash, svn_version, chroot_path,
"""Updates the packages' LLVM_NEXT."""
change_list = update_chromeos_llvm_hash.UpdatePackages(
- packages,
- update_chromeos_llvm_hash.LLVMVariant.next,
- git_hash,
- svn_version,
- chroot_path,
- failure_modes.FailureModes.DISABLE_PATCHES,
- svn_option,
+ packages=packages,
+ manifest_packages=[],
+ llvm_variant=update_chromeos_llvm_hash.LLVMVariant.next,
+ git_hash=git_hash,
+ svn_version=svn_version,
+ chroot_path=chroot_path,
+ mode=failure_modes.FailureModes.DISABLE_PATCHES,
+ git_hash_source=svn_option,
extra_commit_msg=None)
print('\nSuccessfully updated packages to %d' % svn_version)
diff --git a/llvm_tools/update_packages_and_run_tests.py b/llvm_tools/update_packages_and_run_tests.py
index 1d122800..477caa61 100755
--- a/llvm_tools/update_packages_and_run_tests.py
+++ b/llvm_tools/update_packages_and_run_tests.py
@@ -436,13 +436,14 @@ def main():
extra_commit_msg += cq_trybot_msg
change_list = update_chromeos_llvm_hash.UpdatePackages(
- update_chromeos_llvm_hash.DEFAULT_PACKAGES,
- llvm_variant,
- git_hash,
- svn_version,
- args_output.chroot_path,
- failure_modes.FailureModes.DISABLE_PATCHES,
- svn_option,
+ packages=update_chromeos_llvm_hash.DEFAULT_PACKAGES,
+ manifest_packages=[],
+ llvm_variant=llvm_variant,
+ git_hash=git_hash,
+ svn_version=svn_version,
+ chroot_path=args_output.chroot_path,
+ mode=failure_modes.FailureModes.DISABLE_PATCHES,
+ git_hash_source=svn_option,
extra_commit_msg=extra_commit_msg)
AddReviewers(change_list.cl_number, args_output.reviewers,