1003361 - b2g tagging script

Status: RESOLVED FIXED

(Release Engineering :: General, defect)

Description

[Aki Sasaki (not active)]

For merge day.
https://wiki.mozilla.org/ReleaseEngineering/Merge_Duty/Steps#Tag_B2G_Gecko.2BGaia_for_MERGEDAY

Comment 1

[Aki Sasaki (not active)]

Attachment: (needs testing) mozharness b2g tagging script

Comment 2

[Aki Sasaki (not active)]

Attachment: b2g_tag

Comment 3

[Rail Aliiev [:rail]]

Comment on attachment 8421240 [details] [diff] [review]
b2g_tag

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

::: scripts/merge_day/b2g_tag.py
@@ +98,5 @@
> +            By default everything in self.config['b2g_branches'],
> +            but we can override that list with --gecko-repos.
> +            """
> +        if self.gecko_repos:
> +            return self.gecko_repos

Just a random idea, not related to the current review.

I see this pattern (if self.prop: return prop) almost everywhere in mozharness. We could use @property and use (or implement) LRU cache (like in https://docs.python.org/3/library/functools.html#functools.lru_cache) to get rid of the boilerplate and make the code more readable.

Something like this:

@property
@lru_cache()
def gecko_repos(self):
    gecko_repos = self.config.get("gecko_repos", self.config['b2g_branches'].keys())
    gecko_repos.sort()
    return gecko_repos

And later in the code reference as self.gecko_repos.

@@ +191,5 @@
> +        if self.run_command(cmd, cwd=hg_dir, error_list=HgErrorList):
> +            raise VCSException("Can't tag %s with %s" % (repo_name, tag_name))
> +        # Debugging! Echo only for now.
> +        # cmd = hg + ["push", push_url]
> +        cmd = ["echo"] + hg + ["push", push_url]

Do you still need to "echo"?

@@ +229,5 @@
> +        ):
> +            raise VCSException("Can't tag gaia for %s!" % hg_repo_name)
> +        if self.run_command(
> +            # Debugging! Echo only for now.
> +            ["echo"] + git + ["push", "--tags"],

the same here

@@ +269,5 @@
> +                git + ["pull"],
> +                cwd=dirs['abs_gaia_dir'],
> +                error_list=GitErrorList,
> +                halt_on_failure=True,
> +            )

Feature request: add something like "hg strip --no-backup 'outgoing()'" here. Not critical.

Comment 4

[Aki Sasaki (not active)]

Comment on attachment 8421240 [details] [diff] [review]
b2g_tag

https://hg.mozilla.org/build/mozharness/rev/7b6bc80e7c15

Landed, with the echos for now... I'm going to be a bit cautious until this works properly next merge day.

Comment 5

[Aki Sasaki (not active)]

Also, https://bugzilla.mozilla.org/show_bug.cgi?id=1009252

Comment 6

[Aki Sasaki (not active)]

I'm going to keep this open til I see it working properly on merge day.

Comment 7

[Aki Sasaki (not active)]

Attachment: fix_b2g_tag

This:

* adds some load_json_from_url output
* fixes query_gecko_repos() (can't sort a tuple)
* adds a clean-repos action that strips the gecko repos and |git tag -d|s the gaia repo.

Comment 8

[Rail Aliiev [:rail]]

Comment on attachment 8421443 [details] [diff] [review]
fix_b2g_tag

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

lgtm

Comment 9

[Aki Sasaki (not active)]

Comment on attachment 8421443 [details] [diff] [review]
fix_b2g_tag

https://hg.mozilla.org/build/mozharness/rev/3afedb2df2cf

Comment 10

[Aki Sasaki (not active)]

https://wiki.mozilla.org/ReleaseEngineering/Merge_Duty/Steps#Tag_B2G_Gecko.2BGaia_for_MERGEDAY

Comment 11

[Aki Sasaki (not active)]

Attachment: b2g_tag.diff

as run today.

Comment 12

[Aki Sasaki (not active)]

Comment on attachment 8437361 [details] [diff] [review]
b2g_tag.diff

https://hg.mozilla.org/build/mozharness/rev/c5738f6ef014

Comment 13

[Simone Bruno [:simone]]

Live with reconfig on 2014-06-11 08:47 PT