655959 - Revise named branch strategy for Mozmill tests repository

Status: RESOLVED FIXED

(Mozilla QA Graveyard :: Mozmill Tests, defect)

Description

[Henrik Skupin [:whimboo][⌚️UTC+2] (away 07/21 - 08/08)]

As it has been turned out on bug 655765 we have to revise the naming of our branches. Right now we have a flaky detection of the underlying branch of the application, which could break again in the future. Our script wants to be too smart and we should stop it.

Therefore I propose the following names given by the application branch:

mozilla-central -> default
releases/mozilla-aurora -> mozilla-aurora
releases/mozilla-beta -> mozilla-beta
releases/mozilla-2.0 -> mozilla-2.0
releases/mozilla-1.9.2 -> mozilla-1.9.2
releases/mozilla-1.9.1 -> mozilla-1.9.1

That means we would have to rename the following named branches:

aurora -> mozilla-aurora
beta -> mozilla-beta
mozilla2.0 -> mozilla-2.0
mozilla1.9.2 -> mozilla-1.9.2
mozilla1.9.1 -> mozilla-1.9.1

That way we are in sync with the repository names on hg.m.o and do not introduce our own names.

There is no easy way to rename a branch. So we have to create new branches from the existing ones, and close the old ones right after.

Comment 1

[Geo Mealer [:geo] -- This account is inactive after 2015-07-07]

Seems reasonable to me. Any downsides we should consider?

Comment 2

[Henrik Skupin [:whimboo][⌚️UTC+2] (away 07/21 - 08/08)]

Except a bit larger repository, I'm not aware of any downside. It should be future proven.

Steps:
1. Freeze the tree
2. Create new branches
3. Update automation script to handle the new branches
4. Close old branches
5. Unfreeze the tree

Comment 3

[Henrik Skupin [:whimboo][⌚️UTC+2] (away 07/21 - 08/08)]

Since no complains exist, I will go ahead with step 1, 2, and 3 tomorrow morning. A patch for the automation script should be ready for review in the morning PDT. So we can have this bug solved by EOD tomorrow.

Comment 4

[Henrik Skupin [:whimboo][⌚️UTC+2] (away 07/21 - 08/08)]

New branches have been pushed to the repository:
http://hg.mozilla.org/qa/mozmill-tests/pushloghtml

Patch for the automation script follows-up in a minute.

Comment 5

[Henrik Skupin [:whimboo][⌚️UTC+2] (away 07/21 - 08/08)]

Attachment: Patch v1

Comment 6

[Henrik Skupin [:whimboo][⌚️UTC+2] (away 07/21 - 08/08)]

CC'ing Mark so he is aware of this change. If you spot a failure with Thunderbird please let us know! IMO it should work fine.

Comment 7

[Henrik Skupin [:whimboo][⌚️UTC+2] (away 07/21 - 08/08)]

Landed as:
http://hg.mozilla.org/qa/mozmill-automation/rev/6ed3a9a12d63

I will now close our old and now unused branches.

Comment 8

[Henrik Skupin [:whimboo][⌚️UTC+2] (away 07/21 - 08/08)]

Old branches have been closed and will no longer appear. Make sure to switch to the right branch before continuing your work on those branches.