827307 - be able to set gaia_commit.txt when gaia is stored in mercurial

Status: RESOLVED FIXED

(Firefox OS Graveyard :: Gaia::Settings, defect)

Description

[John Ford [:jhford] CET/CEST Berlin Time]

The releng builds of B2G use a copy Gaia that is stored in a mercurial repository.  We should be able to set that in gaia-commit.txt at build time, then read it in at runtime.

Without this, it's impossible to know which mercurial changeset the releng dogfooding builds are based on.

Comment 1

[Chris AtLee [:catlee]]

For nightly builds we look up the git revision that corresponds to the hg revision we checked out and write that into sources.xml before starting the build process. Maybe easiest to base gaia-commit.txt on sources.xml?

Comment 2

[John Ford [:jhford] CET/CEST Berlin Time]

Attachment: if gaia_commit_override.txt exists in gaia/, use it

Rather than parsing a sources.xml file in the gaia build system for this, let's instead allow the releng system to create a file in the gaia source directory which contains the required information.

Chris, if this patch is landed, you'd need to create a file which matches the formatting output by "git log -1 --format="%H%n%at" HEAD".  That file should be created before running build.sh or make in gaia.  Removing the override file as part of the build's cleanup steps is probably a good idea as it lowers the risk of leaving an out of date file in the built image.



Example gaia_commit.txt:
========================================================
550e4775249ac74cf983c4a1596bdae4219f27b7
1357573826
========================================================

This example corresponds to a non-formatted output of:
========================================================
commit 550e4775249ac74cf983c4a1596bdae4219f27b7
Merge: f80478e 3ee6d9d
Author: Dale  Harvey <[e-mail]>
Date:   Mon Jan 7 07:50:26 2013 -0800

    Merge pull request #7328 from ttaubert/gallery/bug-826394-videos-in-gallery-picker
    
    Bug 826394 - Don't show videos in gallery picker
========================================================

Comment 3

[John Ford [:jhford] CET/CEST Berlin Time]

Comment on attachment 699036 [details] [diff] [review]
if gaia_commit_override.txt exists in gaia/, use it

Chris, I've landed this patch.

https://github.com/mozilla-b2g/gaia/commit/7548e58040eef5b8971861922af3d3f2ab937785

Comment 4

[John Ford [:jhford] CET/CEST Berlin Time]

No work left here, should we file a releng bug to create this file in automation?