Moves nightly/beta configuration to be a "build type" #1693

mitchhentges · 2019-04-17T12:54:21Z

Hey 👋
I was setting up automation work to build a beta, and I noticed that the channels were represented as another axis of "flavors" rather than "build types".

I think that nightly and beta are better represented as build_typess because:

We want to configure signing (avoid it, sign manually later) and release information (e.g.: append to product id) based on whether we're "debug", "nightly" or "beta"
We'd never want a "debug" build with the "beta" channel, which points to how the "flavor" might not be the right fit
By reducing the number of dimensions, we reduce the number of potential tasks that can be generated and otherwise simplify our interaction with gradle.

Notes:

@JohanLorenzo this affects routes, so raptor automation will need to be updated to point to the new routes :/
I fixed the "print variant information" blocks so that the correct version code is printed for nightlies

What do you guys think?

Pull Request checklist

Quality: This PR builds and passes detekt/ktlint checks (A pre-push hook is recommended)
Changelog: This PR includes a changelog entry or does not need one
Accessibility: The code in this PR follows accessibility best practices or does not include any user facing features

pocmo · 2019-04-17T13:26:05Z

app/build.gradle

-
-            applicationId "org.mozilla.firefox_beta"
-        }
-        firefoxRelease {


There are flavor specific sources in src. If we remove those flavors then let's remove the sources too.

pocmo · 2019-04-17T13:26:52Z

app/build.gradle

+        }
+        greenfieldBeta {
+            initWith release
+            applicationIdSuffix ".beta"


If we drop the "firefox" variants then let's drop the "greenfield" part here too.

I'm 100% on board, but be advised that yesterday we talked about keeping the greenfield moniker around for a bit

Yeah, but this was in conjunction with the firefox types. If we don't keep them then there's no reason to keep greenfield. :)

pocmo · 2019-04-17T13:28:46Z

app/build.gradle

            shrinkResources true
            minifyEnabled true
            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            matchingFallbacks = ['release']


Interesting that this works. This may need a comment though; otherwise it's confusing: Why does "release" need a fallback on itself?

pocmo · 2019-04-17T13:30:00Z

app/build.gradle

+            applicationIdSuffix ".debug"
+            manifestPlaceholders.isRaptorEnabled = "true"
+        }
+        release { // This isn't deployed to Google Play, but is used as a template for "real" releases like "beta"


Is the goal to eventually use this for the release build? Having this build type just for the sake of having a template is going to be expensive. Or can the actual "only-release" build be ignored in variantFilter?

That's a really good point, yeah. I'll represent the template separately, too, so it's not confusing what's reused and what's filtered 👍

JohanLorenzo

Thanks a lot for the cleanup. I'm 👍 for these changes. I don't mind changing the routes and letting other teams know. That said, I think we need a new namespace. I left more details below. Tell me what you think!

JohanLorenzo · 2019-04-17T14:56:12Z

app/build.gradle

+        }
+        greenfieldBeta {
+            initWith release
+            applicationIdSuffix ".beta"


If we decide to change the applicationId, then we won't be able to ship Fennec Release on the same product as Fennec beta. Per https://docs.google.com/document/d/16lkNScmpnuMCuv38MNGPB2VbMVsa_3B5ryXma6mylSo/edit [section "Fennec Beta (May 1st)], we still don't know what we want to do. I'd recommend to get rid of the suffix for now. @pocmo @colintheshots do you guys see a reason to keep it? I don't know if I'm missing something.

I'll remove it for now. This is editable though (until the beta goes out), so we're flexible for the moment

JohanLorenzo · 2019-04-17T14:57:55Z

automation/taskcluster/decision_task.py

@@ -57,7 +57,7 @@ def pr_or_push(is_master_push):
        build_tasks[assemble_task_id] = BUILDER.craft_assemble_task(variant)
        build_tasks[taskcluster.slugId()] = BUILDER.craft_test_task(variant)

-        arch, build_type, _ = _get_architecture_and_build_type_and_product_from_variant(variant)
+        arch, build_type = _get_architecture_and_build_type_and_product_from_variant(variant)


Nit: Rename function into _get_architecture_and_build_type_from_variant() because the product is not returned anymore. Alternative: I'm fine changing the name into something else too.

🤦‍♂️ good eye, derp

JohanLorenzo · 2019-04-17T15:00:30Z

automation/taskcluster/lib/tasks.py

        artifacts = {
            'public/target.{}.apk'.format(arch): {
                "type": 'file',
                "path": '/opt/fenix/app/build/outputs/apk/'
-                        '{}Greenfield/release/app-{}-greenfield-release-unsigned.apk'.format(arch, arch),
+                        '{}/greenfieldNightly/app-{}-greenfieldNightly-unsigned.apk'.format(arch, arch),


Nit: I just realized we can reuse https://github.com/mozilla-mobile/fenix/pull/1693/files#diff-59f90d509bc6ae2c9d877250c5ba49c5R458. We can expose a function called _craft_apk_full_path_from_architecture_and_build_type() and call it here. Can be done in a followup

With the advent of decisionlib/taskgraph, I'll leave this for a follow-up

automation/taskcluster/lib/tasks.py

JohanLorenzo · 2019-04-17T15:03:55Z

automation/taskcluster/lib/tasks.py

@@ -504,20 +491,7 @@ def _get_architecture_and_build_type_and_product_from_variant(variant):
            )
        )

-    remaining_variant_data = variant[len(architecture):len(variant) - len(build_type)]


colintheshots · 2019-04-17T16:12:58Z

app/build.gradle

+            manifestPlaceholders.isRaptorEnabled = "true"
+        }
+        nightly releaseTemplate
+        beta releaseTemplate


Why do we have a different beta buildType? Are we planning to have different store entries like Fennec? Or are we planning to release the release version to beta before release like Focus?

We can push the same binary to beta and then to release, but we'll have to decide how to indicate to users if they're on the beta channel. Google doesn't tell us what track the user is on.

Good question, this was confusing with release still being in there. Now, we have just nightly and beta build types.

How we handle releasing (fennec/focus) is still fluctuating at the moment, so I've got no good answers there :)

mitchhentges · 2019-04-17T17:14:41Z

Bitrise is failing due to variant changes:

Failed to find buildable variants, error: variant: x86GreenfieldDebug not found in any module

If we use x86Debug instead, it should be fine

colintheshots · 2019-04-22T15:20:19Z

Looks like there's one merge conflict.

mitchhentges requested review from pocmo, colintheshots and JohanLorenzo April 17, 2019 12:54

mitchhentges requested review from a team as code owners April 17, 2019 12:54

ghost assigned mitchhentges Apr 17, 2019

ghost added the review label Apr 17, 2019

pocmo reviewed Apr 17, 2019

View reviewed changes

mitchhentges force-pushed the gradle-channel-build-type branch from af95a31 to 637eb20 Compare April 17, 2019 15:02

JohanLorenzo reviewed Apr 17, 2019

View reviewed changes

colintheshots reviewed Apr 17, 2019

View reviewed changes

mitchhentges force-pushed the gradle-channel-build-type branch 2 times, most recently from 124f6c3 to d2b1b6b Compare April 17, 2019 16:57

mitchhentges requested review from JohanLorenzo, pocmo and colintheshots April 18, 2019 08:36

mitchhentges mentioned this pull request Apr 18, 2019

Updates Fenix taskcluster tasks to support beta release #1765

Closed

3 tasks

colintheshots approved these changes Apr 22, 2019

View reviewed changes

Moves release flavour to build type

0d281fb

mitchhentges force-pushed the gradle-channel-build-type branch from d2b1b6b to 0d281fb Compare April 22, 2019 16:19

boek merged commit 92b6d4a into mozilla-mobile:master Apr 22, 2019

ghost removed the review label Apr 22, 2019

mitchhentges mentioned this pull request Apr 22, 2019

Updates Fenix taskcluster tasks to support beta release #1893

Merged

7 tasks

sblatz pushed a commit to sblatz/fenix that referenced this pull request Apr 22, 2019

Moves release flavour to build type (mozilla-mobile#1693)

0568d6b

mitchhentges deleted the gradle-channel-build-type branch June 24, 2019 20:34

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Moves nightly/beta configuration to be a "build type" #1693

Moves nightly/beta configuration to be a "build type" #1693

mitchhentges commented Apr 17, 2019

pocmo Apr 17, 2019

pocmo Apr 17, 2019

mitchhentges Apr 17, 2019

pocmo Apr 17, 2019

pocmo Apr 17, 2019

pocmo Apr 17, 2019

mitchhentges Apr 17, 2019

JohanLorenzo left a comment

JohanLorenzo Apr 17, 2019

mitchhentges Apr 17, 2019

JohanLorenzo Apr 17, 2019

mitchhentges Apr 17, 2019

JohanLorenzo Apr 17, 2019

mitchhentges Apr 17, 2019

JohanLorenzo Apr 17, 2019

colintheshots Apr 17, 2019

mitchhentges Apr 17, 2019

mitchhentges commented Apr 17, 2019

colintheshots commented Apr 22, 2019

Moves nightly/beta configuration to be a "build type" #1693

Moves nightly/beta configuration to be a "build type" #1693

Conversation

mitchhentges commented Apr 17, 2019

Pull Request checklist

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

JohanLorenzo left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mitchhentges commented Apr 17, 2019

colintheshots commented Apr 22, 2019