875526 - Please reset gaia-ui-tests mirror at https://github.com/mozilla/gaia-ui-tests

Status: RESOLVED FIXED

(Release Engineering :: General, defect)

Description

[Jonathan Griffin (:jgriffin)]

It's been decided that the branch of https://github.com/mozilla/gaia-ui-tests that will be used for B2G desktop builds in TBPL is the 'desktop' branch.  Currently, we're mirroring the 'master' branch to http://hg.mozilla.org/integration/gaia-ui-tests/; we'll need the 'desktop' branch mirrored as well.

Following the convention we're using for gaia, this probably means mirroring to a separate hg repo, e.g., http://hg.mozilla.org/integration/gaia-ui-tests-desktop/.

If it's easier, we could re-purpose http://hg.mozilla.org/integration/gaia-ui-tests/ to mirror the desktop branch instead of master, but we're likely to need the master branch mirrored as well by the B2G v1.2 timeframe.

Comment 1

[John O'Duinn [:joduinn] (please use "needinfo?" flag)]

Found in triage... if I read this correctly:

1) is the "desktop" branch being used for testing v1.1 b2g desktop builds (built using b2g18 / gaia v1.1)?

2) is the "master" branch of gaia-ui-tests being used for our v1.2 b2g desktop builds (build using m-c / gaia master)?

3) unstated, but worth asking: who is going to make sure changes landed on v1.1 gaia-ui-tests are being copied frequently to the v1.2 gaia-ui-tests branch... so both sets of builds and tests can continue being built and pass on tbpl?

Comment 2

[Jonathan Griffin (:jgriffin)]

Yes, there's some unfortunate ambiguity about these branch names.  I'd prefer to make gaia-ui-tests have the same branch names (and meanings) as gaia, but WebQA (who owns that repo) feels it would be disruptive, since they don't currently have the resources to spend either on B2G desktop tests or 1.2, and they're concerned about their own work on 1.0.1/1.1 (which occurs on Jenkins) accidentally de-stabilizing the gaia-master work happening on TBPL, or vice-versa.

Zac, Stephen, please jump in if I got any of that wrong.

The imperfect workaround, then, is to push 1.2 b2g desktop work off into a separate "desktop" branch.  At some point, when WebQA begins to focus on 1.2, we would probably merge the desktop work back into the main branch, but how or when that might happen is not clear.

As far as TBPL goes, there is no intention of ever running 1.0.1/1.1 gaia-ui-tests on B2G desktop tests there.  Our mandate from Jonas/Vivien is to get them running and stable on master, so we're in a good position for 1.2 and future releases.

Using a "desktop" branch is then a short-term compromise that may allow us to get tests in TBPL for purposes of catching regressions on gaia-master, which is explicitly not a goal of the WebQA folks, who are focused entirely on 1.1/1.0.1.

Ultimately for these tests to be successful in TBPL, I think we'll need a better alignment between development/QA/WebQA, but that's way beyond the scope of this bug.

Comment 3

[John O'Duinn [:joduinn] (please use "needinfo?" flag)]

zac/jgriffin/jonas/hwine/joduinn met this morning to figure out whats going on and whats needed. That uncovered further questions, and corrections to whats already here in this bug and linked bug. Once we finished detangling, we will update this bug with a revised plan.

Comment 4

[Jonathan Griffin (:jgriffin)]

We aren't going to use the 'desktop' branch, instead, we'll use the 'master' branch.  We already have an hg mirror of gaia-ui-tests at http://hg.mozilla.org/integration/gaia-ui-tests/, but this appears to be mirroring commits made to the 1.0.1 branch of gaia-ui-tests; we should reset it so it mirrors the 'master' branch instead.

Comment 5

[hwine]

All git branches of gaia-ui-tests are being mirrored to the hg repository as bookmarks. (I.e. it's in there!)

Because all the bookmarks appear on hg branch 'default' the webui will also show commits from other git branches (I'll be correcting this shortly)

To properly reference a bookmark in mozharness, specify a 'revision' of the bookmark name (same as git branch name) and leave 'branch' unspecified or set to 'None'.

That should resolve the issue.