[vim3] Revert to direct push to third-party-mirror Revert Gerrit review destination changes as the builder now has direct push rights. This restores the use of git.destination and push-justification. Bug: 435534715 TAG=agy CONV=a991dad9-800d-4aff-bf0b-11117211f921 Change-Id: Ie305bf033597630660de4eeab215dd42484e2a31 Reviewed-on: https://turquoise-internal-review.googlesource.com/c/third_party/u-boot/+/1376431 Reviewed-by: David Pursell <dpursell@google.com> Commit-Queue: Sergii Parubochyi <sergiip@google.com> GitOrigin-RevId: 26cb407ce40cafbf0561304a6c8c8ba538843967
diff --git a/fuchsia_upload.py b/fuchsia_upload.py index b5eeef4..17fdfea 100755 --- a/fuchsia_upload.py +++ b/fuchsia_upload.py
@@ -33,7 +33,7 @@ _REPO_NAME = "u-boot" _UPSTREAM_BRANCH = "origin/vim3" -_THIRD_PARTY_REPO_URL = f"https://third-party-mirror-review.googlesource.com/{_REPO_NAME}/" +_THIRD_PARTY_REPO_URL = f"https://third-party-mirror.googlesource.com/{_REPO_NAME}/" _LICENSE_SEPARATOR = "\n===================================\n\n" @@ -220,20 +220,6 @@ logging.warning("No source revision given, using 'vim3' ToT") revision = "vim3" - reviewers = [] - # Omit reviewers on builder to avoid Gerrit 'Account not found' errors - # caused by service account visibility restrictions (VISIBLE_GROUP). - if not is_on_builder(): - reviewers = [ - "dpursell@google.com", - "zyecheng@google.com", - "dovs@google.com", - "sergiip@google.com", - ] - - # Format the reviewers list for Starlark - reviewers_starlark = "".join(f'"{r}", ' for r in reviewers) - # http://go/copybara-reference. contents = textwrap.dedent( f"""\ @@ -243,11 +229,9 @@ url = "https://turquoise-internal.googlesource.com/third_party/u-boot", ref = "{revision}", ), - destination = git.gerrit_destination( + destination = git.destination( url = "{_THIRD_PARTY_REPO_URL}", - fetch = "vim3", - change_id_policy = "REUSE", - reviewers = [{reviewers_starlark}], + push = "vim3", ), mode = "ITERATIVE", authoring = authoring.pass_thru( @@ -342,6 +326,7 @@ copybara_path: str, last_rev: Optional[str], dry_run: bool, + push_justification: str, ): """Publishes this source to the public repo. @@ -352,6 +337,7 @@ only to initialize the repo the first time so we can tell Copybara where to start. dry_run: True to skip submitting anything. + push_justification: BugID for push justification. Raises: subprocess.CalledProcessError if copybara fails. @@ -368,6 +354,8 @@ copybara_path, "--singlejar", str(config_path), + "--git-push-option", + "push-justification=" + push_justification, ] if last_rev: command += ["--last-rev", last_rev] @@ -410,6 +398,11 @@ " Only use this on the first run to tell copybara where to start.", ) parser.add_argument( + "--push-justification", + default="b/302031093", + help="BugID for git push justification.", + ) + parser.add_argument( "--clean-cipd", action="store_true", help="Clear CIPD dependencies dir before start", @@ -427,7 +420,7 @@ logging.basicConfig(level=logging.INFO) args = _parse_args() - if not args.dry_run or is_on_builder(): + if is_on_builder(): setup_gob_auth() if args.clean_cipd: @@ -457,7 +450,13 @@ else: raise - publish_source(revision, args.copybara, args.last_rev, args.dry_run) + publish_source( + revision, + args.copybara, + args.last_rev, + args.dry_run, + args.push_justification, + ) try: fuchsia_build(