Closed Bug 714063 Opened 8 years ago Closed 5 years ago

SingleSourceFactory should use intree mozconfigs if they exist

Categories

(Release Engineering :: Release Automation: Other, defect, P3)

All
Linux
defect

Tracking

(Not tracked)

RESOLVED FIXED

People

(Reporter: rail, Assigned: rail)

References

Details

(Whiteboard: [releases][automation])

Attachments

(7 files, 3 obsolete files)

ATM we use mozconfigs from buildbot-configs.
Priority: -- → P3
No longer blocks: hg-automation
Mass move of bugs to Release Automation component.
Component: Release Engineering → Release Engineering: Automation (Release Automation)
No longer blocks: hg-automation
I may be doing this in bug 748796.
Assignee: nobody → aki
Not actively working on this.
Assignee: aki → nobody
Product: mozilla.org → Release Engineering
While I'm touching some release automation, I'll take a look at this one too.
Assignee: nobody → rail
QA Contact: rail
v2, with tooltool enabled
Attachment #8558041 - Attachment is obsolete: true
Moar cleanup, make mozconfig required
Attachment #8558675 - Attachment is obsolete: true
Looks like this is dead too
refresh
Attachment #8558042 - Attachment is obsolete: true
Attachment #8558698 - Flags: review?(bhearsum)
Attachment #8558719 - Flags: review?(bhearsum)
Attachment #8558720 - Flags: review?(bhearsum)
Attachment #8559090 - Flags: review?(bhearsum)
Comment on attachment 8558720 [details] [diff] [review]
SingleSourceFactory-buildbot-configs.diff

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

diediediedideideideie
Attachment #8558720 - Flags: review?(bhearsum) → review+
Attachment #8559090 - Flags: review?(bhearsum) → review+
Comment on attachment 8558719 [details] [diff] [review]
SingleSourceFactory-mozharness.diff

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

::: configs/multi_locale/mozilla-aurora_android.json
@@ -25,5 @@
>      "hg_l10n_tag": "default",
>      "l10n_dir": "mozilla-aurora",
>      "merge_locales": true,
> -    "mozilla_dir": "build",
> -    "mozconfig": "build/configs/mozilla2/mobile/android/mozilla-aurora/nightly/mozconfig"

Why is mozconfig no longer needed?
Attachment #8558698 - Flags: review?(bhearsum) → review+
(In reply to Ben Hearsum [:bhearsum] from comment #12)
> Comment on attachment 8558719 [details] [diff] [review]
> SingleSourceFactory-mozharness.diff
> 
> Review of attachment 8558719 [details] [diff] [review]:
> -----------------------------------------------------------------
> 
> ::: configs/multi_locale/mozilla-aurora_android.json
> @@ -25,5 @@
> >      "hg_l10n_tag": "default",
> >      "l10n_dir": "mozilla-aurora",
> >      "merge_locales": true,
> > -    "mozilla_dir": "build",
> > -    "mozconfig": "build/configs/mozilla2/mobile/android/mozilla-aurora/nightly/mozconfig"
> 
> Why is mozconfig no longer needed?

I have no idea. Probably we forgot to delete them after switching to in-tree mozconfigs. I tested the multilocale builds in staging to be sure, and they worked fine.
Comment on attachment 8558698 [details] [diff] [review]
SingleSourceFactory-buildbotcustom-2.diff

https://hg.mozilla.org/build/buildbotcustom/rev/10f70016ef77
Attachment #8558698 - Flags: checked-in+
Comment on attachment 8559090 [details] [diff] [review]
SingleSourceFactory-tools.diff

https://hg.mozilla.org/build/tools/rev/5ab442bd20a0
Attachment #8559090 - Flags: checked-in+
Comment on attachment 8558720 [details] [diff] [review]
SingleSourceFactory-buildbot-configs.diff

https://hg.mozilla.org/build/buildbot-configs/rev/673c56fcf766
Attachment #8558720 - Flags: checked-in+
Attachment #8558719 - Flags: review?(bhearsum) → review+
Failed for android:
cp: cannot stat `mobile/config/mozconfigs/linux64/release': No such file or directory
Add a way to override source_mozconfig (for thunderbird). I checked, android builds used to use the same mozconfig for this builder as firefox and xulrunner.
Attachment #8559792 - Flags: review?(bhearsum)
Overrides for thunderbird
Attachment #8559793 - Flags: review?(bhearsum)
Comment on attachment 8559792 [details] [diff] [review]
SingleSourceFactory-buildbotcustom.diff

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

::: process/release.py
@@ +501,5 @@
>      if not releaseConfig.get('skip_source'):
>          pf = branchConfig['platforms']['linux64']
> +        mozconfig = releaseConfig.get(
> +            'source_mozconfig',
> +            'browser/config/mozconfigs/linux64/release')

Shouldn't this be %(appName)s instead of browser?
Attachment #8559793 - Flags: review?(bhearsum) → review+
(In reply to Ben Hearsum [:bhearsum] from comment #22)
> Comment on attachment 8559792 [details] [diff] [review]
> SingleSourceFactory-buildbotcustom.diff
> 
> Review of attachment 8559792 [details] [diff] [review]:
> -----------------------------------------------------------------
> 
> ::: process/release.py
> @@ +501,5 @@
> >      if not releaseConfig.get('skip_source'):
> >          pf = branchConfig['platforms']['linux64']
> > +        mozconfig = releaseConfig.get(
> > +            'source_mozconfig',
> > +            'browser/config/mozconfigs/linux64/release')
> 
> Shouldn't this be %(appName)s instead of browser?

It won't work for android with different directory layout. Additionally we always used browser/linux mozconfigs for android to generate source tarballs (of course!)
Comment on attachment 8558719 [details] [diff] [review]
SingleSourceFactory-mozharness.diff

https://hg.mozilla.org/build/mozharness/rev/f2ace537d36e
Attachment #8558719 - Flags: checked-in+
Additionally I filed bug 1129927 to have a mach target for this.
Comment on attachment 8559792 [details] [diff] [review]
SingleSourceFactory-buildbotcustom.diff

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

Please add a comment to explain this, r=me with that.
Attachment #8559792 - Flags: review?(bhearsum) → review+
Comment on attachment 8559793 [details] [diff] [review]
SingleSourceFactory-buildbot-configs.diff

https://hg.mozilla.org/build/buildbot-configs/rev/7861f20788f2
Attachment #8559793 - Flags: checked-in+
Comment on attachment 8559792 [details] [diff] [review]
SingleSourceFactory-buildbotcustom.diff

https://hg.mozilla.org/build/buildbotcustom/rev/34b38c777aae
Attachment #8559792 - Flags: checked-in+
Green!
Status: NEW → RESOLVED
Closed: 5 years ago
Resolution: --- → FIXED
It turns out that we also add the tooltool files to the tarball. Boooo.
Status: RESOLVED → REOPENED
Resolution: FIXED → ---
Blocks: 1136240
http://hg.mozilla.org/mozilla-central/file/6608e0605dfc/build/unix/mozconfig.linux#l12 has an option to avoid using tootool.

Tested in staging for firefox release, fennec release and thunderbird-esr31. The sizes are back to normal.
Attachment #8569265 - Flags: review?(bhearsum)
Attachment #8569265 - Flags: review?(bhearsum) → review+
Comment on attachment 8569265 [details] [diff] [review]
source_no_tooltool-buildbotcustom.diff

https://hg.mozilla.org/build/buildbotcustom/rev/a8fcb52a5b8f
Attachment #8569265 - Flags: checked-in+
I regenerated the sources, ran the checksums builder and rsynced manually the files.
Status: REOPENED → RESOLVED
Closed: 5 years ago5 years ago
Resolution: --- → FIXED
You need to log in before you can comment on or make changes to this bug.