Closed Bug 1386906 Opened 2 years ago Closed 2 years ago

Add Pocket keys to build system

Categories

(Firefox for Android :: General, enhancement, P1)

ARM
Android
enhancement

Tracking

()

RESOLVED FIXED
Firefox 57
Iteration:
1.27
Tracking Status
firefox57 --- fixed

People

(Reporter: liuche, Assigned: liuche)

References

Details

(Whiteboard: [MobileAS] 1.27 [stockwell infra])

Attachments

(1 file)

No description provided.
This is the Pocket equivalent of bug 1365089 (which handled Leanplum SDK), for adding Pocket Stories to Android Activity Stream.
Depends on: 1387553
I've also filed bug 1387553 for the releng component of adding Pocket keys, and I'll make sure that lands before this one.
Comment on attachment 8893910 [details]
Bug 1386906 - Add Pocket keys to build system.

https://reviewboard.mozilla.org/r/164976/#review170432

::: mobile/android/base/generate_build_config.py:54
(Diff revision 2)
>                  'MOZ_ANDROID_MOZILLA_ONLINE',
>                  'MOZ_ANDROID_PWA',
>                  'MOZ_LEANPLUM_SDK_KEY',
>                  'MOZ_LEANPLUM_SDK_CLIENTID',
> +                'MOZ_ANDROID_POCKET',
> +                'MOZ_POCKET_API_KEY',

I don't think we want 'MOZ_POCKET_API_KEY' in this list (it's set by the bit added below).

::: mobile/android/moz.configure:182
(Diff revision 2)
> +    if android_pocket:
> +        if not pocket_api_keyfile:

These could be combined and put on the same line as well.
Attachment #8893910 - Flags: review?(cmanchester)
Thanks, pushed a new version.

I'll push to try once I get the releng bug fixed and the keys on the builders.
Comment on attachment 8893910 [details]
Bug 1386906 - Add Pocket keys to build system.

https://reviewboard.mozilla.org/r/164976/#review170444
Attachment #8893910 - Flags: review?(cmanchester) → review+
Built this on try and was able to get keys.

I made a few tiny changes: fixed a 'f' typo to 'fi', clarified the comment in mozconfigs/common, and changed the default mozconfig build var for Pocket to True.
Pushed by cliu@mozilla.com:
https://hg.mozilla.org/integration/autoland/rev/59bc932c44ea
Add Pocket keys to build system. r=chmanchester
https://hg.mozilla.org/mozilla-central/rev/59bc932c44ea
Status: NEW → RESOLVED
Closed: 2 years ago
Resolution: --- → FIXED
Target Milestone: --- → Firefox 57
Blocks: 1389257
Wes, I'm pretty sure this broke single-locale fennec builds in one of the infamous "secret is not in repack slave" ways, https://treeherder.mozilla.org/logviewer.html#?job_id=122539768&repo=mozilla-central&lineNumber=1305.

Can you back this out again?
Flags: needinfo?(wkocher)
Backed out in https://hg.mozilla.org/mozilla-central/rev/d0afe5d6350426e338c1acff28a4a0c38ba1965f
Status: RESOLVED → REOPENED
Flags: needinfo?(wkocher)
Resolution: FIXED → ---
Target Milestone: Firefox 57 → ---
Okay, I see what went wrong here - when I set MOZ_ANDROID_POCKET config to True that meant MOZ_ANDROID_POCKET was present even in the l10n-nightly builds, even though I included the --without-pocket-api-keyfile flag. I've fixed this in the patch for bug 1389257 by setting the env variable only in the relevant mozconfigs (and excluding the l10n mozconfig files) rather than True by default, so I'll re-land those together. Should have re-requested review after all...!
Pushed by cliu@mozilla.com:
https://hg.mozilla.org/integration/autoland/rev/73ad9f441386
Add Pocket keys to build system. r=chmanchester
https://hg.mozilla.org/mozilla-central/rev/73ad9f441386
Status: REOPENED → RESOLVED
Closed: 2 years ago2 years ago
Resolution: --- → FIXED
Target Milestone: --- → Firefox 57
Whiteboard: [MobileAS] 1.27 → [MobileAS] 1.27 [stockwell infra]
Blocks: 1393321
You need to log in before you can comment on or make changes to this bug.