Closed Bug 1123367 Opened 6 years ago Closed 6 years ago

Tracking bug for 23-Feb-2015 migration work

Categories

(Release Engineering :: Release Requests, defect)

defect
Not set
normal

Tracking

(Not tracked)

RESOLVED FIXED

People

(Reporter: rail, Assigned: rail)

References

Details

Attachments

(4 files)

+++ This bug was initially created as a clone of Bug #1116781 +++
Depends on: 1120969
No longer depends on: 1117241
Assignee: nobody → rail
Killing the old android mozconfigs!
Attachment #8557548 - Flags: review?(jlund)
Comment on attachment 8557548 [details] [diff] [review]
split_apk_central+aurora.diff

Review of attachment 8557548 [details] [diff] [review]:
-----------------------------------------------------------------

lgtm :)
Attachment #8557548 - Flags: review?(jlund) → review+
Attachment #8564538 - Flags: review?
Comment on attachment 8564538 [details] [diff] [review]
release-gecko-version-bump.diff

I know who's around! :)
Attachment #8564538 - Flags: review? → review?(nthomas)
Attachment #8564538 - Flags: review?(nthomas) → review+
The automation didn't work as expected because of some head duplication due to bug 927219.

abort: push creates new remote head 166543626bbd on branch '14_0_Beta'!

I had to rerun the script as:

python mozharness/scripts/merge_day/gecko_migration.py \
  -c mozharness/configs/selfserve/production.py \
  -c mozharness/configs/merge_day/beta_to_release.py \
  --push --trigger-builders

with the following local patch applied:

diff --git a/scripts/merge_day/gecko_migration.py b/scripts/merge_day/gecko_migration.py
--- a/scripts/merge_day/gecko_migration.py
+++ b/scripts/merge_day/gecko_migration.py
@@ -657,18 +657,20 @@ class GeckoMigration(MercurialScript, Ba
 
     def push(self):
         """
             """
         error_message = """Push failed!  If there was a push race, try rerunning
 the script (--clean-repos --pull --migrate).  The second run will be faster."""
         dirs = self.query_abs_dirs()
         hg = self.query_exe("hg", return_type="list")
-        for cwd in (dirs['abs_from_dir'], dirs['abs_to_dir']):
+        for cwd in (dirs['abs_to_dir'], ):  # Do not push to beta, pushed already
             push_cmd = hg + ['push']
+            push_cmd.append('-r')
+            push_cmd.append('outgoing("https://hg.mozilla.org/releases/mozilla-release") - author("gps@mozilla.com")')  # do not push "bad" heads, while pushing relbranches and tags
             if cwd == dirs['abs_to_dir'] and self.config['migration_behavior'] == 'beta_to_release':
                 push_cmd.append('--new-branch')
             status = self.run_command(
                 push_cmd,
                 cwd=cwd,
                 error_list=HgErrorList,
                 success_codes=[0, 1],
             )
Attached patch gecko_bump2.diffSplinter Review
Attachment #8567301 - Flags: review?(nthomas)
Attachment #8567301 - Flags: review?(nthomas) → review+
aurora-to-beta went as expected, but central-to-aurora failed:

10:35:29    ERROR -  abort: push creates new remote head 25093037bf15 on branch 'COMM2000_20110114_RELBRANCH'!
10:35:29    ERROR -  Automation Error: hg not responding
Depends on: 1135698
FTR, I ran the following per gps' suggestion before pushing:

hg strip -r b58f17a50c16:be94effe221a
Attached patch mh.diffSplinter Review
This is https://bugzilla.mozilla.org/attachment.cgi?id=8554545&action=edit with armv6 deleted
Attachment #8568174 - Flags: review?(jlund)
Comment on attachment 8568174 [details] [diff] [review]
mh.diff

Review of attachment 8568174 [details] [diff] [review]:
-----------------------------------------------------------------

<stamp>
Attachment #8568174 - Flags: review?(jlund) → review+
All done here. Aurora will be unthrottled on Friday
Status: NEW → RESOLVED
Closed: 6 years ago
Resolution: --- → FIXED
Depends on: 1151498
You need to log in before you can comment on or make changes to this bug.