Revert "cros_mark_as_stable: Add auto_merge for server-side rebase."
This reverts commit 09feed378ddc28127caba183608793efc73dfc60.
Reason for revert: http://b/141288313 breaks factory builds. See bug
Original change's description:
> cros_mark_as_stable: Add auto_merge for server-side rebase.
>
> BUG=chromium:1002934
> TEST=run_tests
>
> Change-Id: Ida8be0d005670bac31c927bf237b38f2ebd5e5be
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/1807057
> Reviewed-by: Jason Clinton <jclinton@chromium.org>
> Reviewed-by: Sean Abraham <seanabraham@chromium.org>
> Commit-Queue: Alex Klein <saklein@chromium.org>
> Tested-by: Alex Klein <saklein@chromium.org>
Bug: chromium:1002934
Change-Id: I03304ea08da0bb2331d6e6cc7da6108528ca2ae0
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/1815894
Reviewed-by: Sean Abraham <seanabraham@chromium.org>
Commit-Queue: Sean Abraham <seanabraham@chromium.org>
Tested-by: Sean Abraham <seanabraham@chromium.org>
diff --git a/scripts/cros_mark_as_stable_unittest.py b/scripts/cros_mark_as_stable_unittest.py
index c6b4068..f1263db 100644
--- a/scripts/cros_mark_as_stable_unittest.py
+++ b/scripts/cros_mark_as_stable_unittest.py
@@ -89,7 +89,7 @@
sync_mock.assert_called_with('.', 'gerrit', 'refs/remotes/gerrit/master')
if not bad_cls:
push_mock.assert_called_with('merge_branch', '.', dryrun=False,
- staging_branch=None, auto_merge=True)
+ staging_branch=None)
create_mock.assert_called_with('merge_branch', '.',
remote_push_branch=mock.ANY)