Revert "[rollers] Add bot_commit property"
This reverts commit dc0138b255542841f288417a14a663ebc7189fae.
Reason for revert: not switching to Bot-Commit
Original change's description:
> [rollers] Add bot_commit property
>
> Add a bot_commit property to rollers so they can be configured to set
> Bot-Commit+1 instead of Code-Review+2.
>
> Change-Id: I5d5cfb7c2fe31b720cb3d3d983df85fcffae2b3e
> Reviewed-on: https://fuchsia-review.googlesource.com/c/infra/recipes/+/561541
> Fuchsia-Auto-Submit: Rob Mohr <mohrr@google.com>
> Commit-Queue: Auto-Submit <auto-submit@fuchsia-infra.iam.gserviceaccount.com>
> Reviewed-by: Anthony Fandrianto <atyfto@google.com>
TBR=atyfto@google.com,mohrr@google.com,auto-submit@fuchsia-infra.iam.gserviceaccount.com
Change-Id: I6b4bdff2cd23df4449252fbc8ef4b3009b11b761
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://fuchsia-review.googlesource.com/c/infra/recipes/+/561544
Reviewed-by: Anthony Fandrianto <atyfto@google.com>
Commit-Queue: Rob Mohr <mohrr@google.com>
diff --git a/recipes/contrib/cipd_with_dependencies_roller.py b/recipes/contrib/cipd_with_dependencies_roller.py
index 2055c25..578ca5f 100644
--- a/recipes/contrib/cipd_with_dependencies_roller.py
+++ b/recipes/contrib/cipd_with_dependencies_roller.py
@@ -88,11 +88,6 @@
"A string with the path to the versions file inside " "the CIPD package."
),
),
- "bot_commit": Property(
- kind=bool,
- default=False,
- help="Set Bot-Commit+1 instead of Code-Review+2",
- ),
}
COMMIT_MESSAGE_TITLE = """{prepend}[{type}] {type_descr} {roller} CIPD packages:"""
@@ -125,7 +120,6 @@
version_file,
project_dependencies,
project,
- bot_commit,
):
with api.context(infra_steps=True):
gerrit_host = api.gerrit.host_from_remote_url(manifests[0]["remote"])
@@ -209,7 +203,6 @@
repo_dir=project_dir,
commit_message=message,
dry_run=dry_run,
- bot_commit=bot_commit,
)
return api.auto_roller.raw_result(change)
diff --git a/recipes/contrib/cipd_with_versions_roller.py b/recipes/contrib/cipd_with_versions_roller.py
index b0201b3..0cf5184 100644
--- a/recipes/contrib/cipd_with_versions_roller.py
+++ b/recipes/contrib/cipd_with_versions_roller.py
@@ -157,11 +157,6 @@
default=(),
help="GCS buckets to upload debug symbols to",
),
- "bot_commit": Property(
- kind=bool,
- default=False,
- help="Set Bot-Commit+1 instead of Code-Review+2",
- ),
}
COMMIT_MESSAGE = """[roll] Roll {roller} packages and projects
@@ -186,7 +181,6 @@
dry_run,
debug_symbol_packages,
debug_symbol_gcs_buckets,
- bot_commit,
):
with api.context(infra_steps=True):
if owners:
@@ -326,7 +320,6 @@
presentation=presentation,
checkout_root=checkout_root,
flutter_revision=orchestrator_version_dict["flutter_version"],
- bot_commit=bot_commit,
)
changes = api.jiri.edit_manifest(
"integration/fuchsia/topaz/dart",
@@ -364,7 +357,6 @@
repo_dir=project_dir,
commit_message=message,
dry_run=dry_run,
- bot_commit=bot_commit,
)
rolled = change and change.success
@@ -388,12 +380,7 @@
def update_3p_packages(
- api,
- checkout_root,
- presentation,
- flutter_revision=None,
- dry_run=False,
- bot_commit=False,
+ api, checkout_root, presentation, flutter_revision=None, dry_run=False
):
"""Updates fuchsia's third-party dart packages.
@@ -402,7 +389,6 @@
checkout_root (Path): Root path to checkouts.
flutter_revision (Optional): A git hash within the flutter repo.
dry_run (bool): Whether the roll will be allowed to complete or not.
- bot_commit (bool): Set Bot-Commit+1 instead of Code-Review+2".
Returns:
A string with third_party/dart-pkg/pub latest commit hash.
@@ -430,7 +416,6 @@
commit_message=commit_msg,
commit_untracked=True,
dry_run=dry_run,
- bot_commit=bot_commit,
)
# If we rolled changes, the final hash of the merged CL should
# correspond to the remote HEAD. Otherwise, we can assume that local
diff --git a/recipes/contrib/crashpad_roller.py b/recipes/contrib/crashpad_roller.py
index 144ff81..3814915 100644
--- a/recipes/contrib/crashpad_roller.py
+++ b/recipes/contrib/crashpad_roller.py
@@ -43,11 +43,6 @@
default=[],
help='The list of lockfiles to update in "${manifest}=${lockfile}" format',
),
- "bot_commit": Property(
- kind=bool,
- default=False,
- help="Set Bot-Commit+1 instead of Code-Review+2",
- ),
}
CRASHPAD_PROJECT_NAME = "third_party/crashpad"
@@ -73,9 +68,7 @@
"""
-def RunSteps(
- api, manifest, remote, project, revision, import_in, lockfiles, bot_commit
-):
+def RunSteps(api, manifest, remote, project, revision, import_in, lockfiles):
with api.context(infra_steps=True):
api.jiri.init(use_lock_file=True)
api.jiri.import_manifest(manifest, remote, project)
@@ -113,7 +106,6 @@
gerrit_project=project,
repo_dir=manifest_repo,
commit_message=commit_message,
- bot_commit=bot_commit,
)
return api.auto_roller.raw_result(change)
diff --git a/recipes/contrib/flutter_with_dependents_roller.py b/recipes/contrib/flutter_with_dependents_roller.py
index 8f109d7..fb8898a 100644
--- a/recipes/contrib/flutter_with_dependents_roller.py
+++ b/recipes/contrib/flutter_with_dependents_roller.py
@@ -120,11 +120,6 @@
default=(),
help="GCS buckets to upload debug symbols to",
),
- "bot_commit": Property(
- kind=bool,
- default=False,
- help="Set Bot-Commit+1 instead of Code-Review+2",
- ),
}
COMMIT_MESSAGE = """[roll] Roll {roller} packages and projects:
@@ -145,7 +140,6 @@
dry_run,
debug_symbol_packages,
debug_symbol_gcs_buckets,
- bot_commit,
):
with api.context(infra_steps=True):
if owners:
@@ -234,7 +228,6 @@
presentation=presentation,
checkout_root=checkout_root,
flutter_revision=version_dict["flutter_version"],
- bot_commit=bot_commit,
)
changes = api.jiri.edit_manifest(
"integration/fuchsia/topaz/dart",
@@ -268,7 +261,6 @@
repo_dir=project_dir,
commit_message=message,
dry_run=dry_run,
- bot_commit=bot_commit,
)
rolled = change and change.success
@@ -292,12 +284,7 @@
def update_3p_packages(
- api,
- checkout_root,
- presentation,
- flutter_revision=None,
- dry_run=False,
- bot_commit=False,
+ api, checkout_root, presentation, flutter_revision=None, dry_run=False
):
"""Updates fuchsia's third-party dart packages.
@@ -306,7 +293,6 @@
checkout_root (Path): Root path to checkouts.
flutter_revision (Optional): A git hash within the flutter repo.
dry_run (bool): Whether the roll will be allowed to complete or not.
- bot_commit (bool): Set Bot-Commit+1 instead of Code-Review+2".
Returns:
A string with third_party/dart-pkg/pub latest commit hash.
@@ -334,7 +320,6 @@
commit_message=commit_msg,
commit_untracked=True,
dry_run=dry_run,
- bot_commit=bot_commit,
)
# If we rolled changes, the final hash of the merged CL should
# correspond to the remote HEAD. Otherwise, we can assume that local
diff --git a/recipes/contrib/salt_packer_base_image_roller.py b/recipes/contrib/salt_packer_base_image_roller.py
index a921c79..3a46982 100644
--- a/recipes/contrib/salt_packer_base_image_roller.py
+++ b/recipes/contrib/salt_packer_base_image_roller.py
@@ -29,15 +29,10 @@
"dry_run": Property(
kind=bool, help="Exit early instead of committing a change.", default=True
),
- "bot_commit": Property(
- kind=bool,
- default=False,
- help="Set Bot-Commit+1 instead of Code-Review+2",
- ),
}
-def RunSteps(api, repo, dry_run, bot_commit):
+def RunSteps(api, repo, dry_run):
# Resolve the build input to always contain a Gitiles commit.
api.build_input_resolver.resolve(default_project_url=repo)
@@ -124,7 +119,6 @@
repo_dir=salt_path,
commit_message=commit_message,
dry_run=dry_run,
- bot_commit=bot_commit,
)
diff --git a/recipes/docs_roller.py b/recipes/docs_roller.py
index 6d2609f..cb74dca 100644
--- a/recipes/docs_roller.py
+++ b/recipes/docs_roller.py
@@ -32,15 +32,10 @@
"fint_params_paths": Property(
kind=dict, help="Mapping from target arch to fint parameter file path"
),
- "bot_commit": Property(
- kind=bool,
- default=False,
- help="Set Bot-Commit+1 instead of Code-Review+2",
- ),
}
-def RunSteps(api, manifest, remote, fint_params_paths, bot_commit):
+def RunSteps(api, manifest, remote, fint_params_paths):
gndoc_path = api.cipd.ensure_tool("fuchsia/tools/gndoc/${platform}", "latest")
checkout = api.checkout.fuchsia_with_options(
@@ -74,7 +69,6 @@
gerrit_project="fuchsia",
repo_dir=checkout.root_dir,
commit_message=COMMIT_MESSAGE,
- bot_commit=bot_commit,
)
return api.auto_roller.raw_result(change)
diff --git a/recipes/fuchsia_cipd_roller.py b/recipes/fuchsia_cipd_roller.py
index 3c3838e..1bf3cb2 100644
--- a/recipes/fuchsia_cipd_roller.py
+++ b/recipes/fuchsia_cipd_roller.py
@@ -117,11 +117,6 @@
default=None,
help="Notify option when pushing roll CL.",
),
- "bot_commit": Property(
- kind=bool,
- default=False,
- help="Set Bot-Commit+1 instead of Code-Review+2",
- ),
}
COMMIT_MESSAGE_TITLE = (
@@ -478,7 +473,6 @@
owners,
test_multipliers,
cl_notify_option,
- bot_commit,
):
if owners:
owners_step = api.step("owners", None)
@@ -609,7 +603,6 @@
create_unique_id=create_unique_change_id,
dry_run=dry_run,
force_submit=force_submit,
- bot_commit=bot_commit,
)
rolled = change and change.success
diff --git a/recipes/fuchsia_roller.proto b/recipes/fuchsia_roller.proto
index b3a7397..49f9be3 100644
--- a/recipes/fuchsia_roller.proto
+++ b/recipes/fuchsia_roller.proto
@@ -57,7 +57,4 @@
// Notify option when pushing roll CL.
string cl_notify_option = 16;
-
- // Set Bot-Commit+1 instead of Code-Review+2.
- bool bot_commit = 19;
}
diff --git a/recipes/fuchsia_roller.py b/recipes/fuchsia_roller.py
index d7f9a8b..106be16 100644
--- a/recipes/fuchsia_roller.py
+++ b/recipes/fuchsia_roller.py
@@ -294,7 +294,6 @@
create_unique_id=props.create_unique_change_id,
dry_run=props.dry_run,
raise_on_failure=False,
- bot_commit=props.bot_commit,
)
return api.auto_roller.raw_result(change)
diff --git a/recipes/release/milestone_roller.proto b/recipes/release/milestone_roller.proto
index 64485fa..fc969ca 100644
--- a/recipes/release/milestone_roller.proto
+++ b/recipes/release/milestone_roller.proto
@@ -30,7 +30,4 @@
// Path to script which generates configurations.
string config_generator_path = 8;
-
- // Set Bot-Commit+1 instead of Code-Review+2.
- bool bot_commit = 9;
}
diff --git a/recipes/release/milestone_roller.py b/recipes/release/milestone_roller.py
index 5d95f46..dcc0f12 100644
--- a/recipes/release/milestone_roller.py
+++ b/recipes/release/milestone_roller.py
@@ -93,7 +93,6 @@
cl_notify_option=props.cl_notify_option,
create_unique_id=props.create_unique_change_id,
dry_run=props.dry_run,
- bot_commit=props.bot_commit,
)
return api.auto_roller.raw_result(change)
diff --git a/recipes/run_script.proto b/recipes/run_script.proto
index a09496d..c8214a9 100644
--- a/recipes/run_script.proto
+++ b/recipes/run_script.proto
@@ -41,9 +41,6 @@
// Whether to dryrun the roll.
bool dry_run = 2;
-
- // Set Bot-Commit+1 instead of Code-Review+2.
- bool bot_commit = 3;
}
// Whether to expect JSON-style CIPD .yaml manifest. TODO(atyfto): Remove this
diff --git a/recipes/run_script.py b/recipes/run_script.py
index 92eaca1..eb1ae4e 100644
--- a/recipes/run_script.py
+++ b/recipes/run_script.py
@@ -75,7 +75,6 @@
commit_message='Run "%s"' % props.script,
commit_untracked=props.roll_props.commit_untracked_files,
dry_run=props.roll_props.dry_run,
- bot_commit=props.roll_props.bot_commit,
)
return api.auto_roller.raw_result(change)
diff --git a/recipes/third_party_repo_roller.proto b/recipes/third_party_repo_roller.proto
index 733119e..bfc8267 100644
--- a/recipes/third_party_repo_roller.proto
+++ b/recipes/third_party_repo_roller.proto
@@ -27,7 +27,4 @@
// The owners responsible for watching this roller e.g. username@google.com.
repeated string owners = 7;
-
- // Set Bot-Commit+1 instead of Code-Review+2.
- bool bot_commit = 8;
}
diff --git a/recipes/third_party_repo_roller.py b/recipes/third_party_repo_roller.py
index 2c2d8fa..47a80e1 100644
--- a/recipes/third_party_repo_roller.py
+++ b/recipes/third_party_repo_roller.py
@@ -138,7 +138,6 @@
commit_message=commit_message,
dry_run=props.dry_run,
raise_on_failure=False,
- bot_commit=props.bot_commit,
)
roll_result = api.auto_roller.raw_result(change)
