1501526 - Port bug 1497860 - Move mozconfig variant definitions to taskcluster config.

Status: RESOLVED FIXED

(Thunderbird :: Build Config, defect)

Description

[Rob Lemley [:rjl]]

Bug 1497860 introduced breaking changes to the Taskcluster configuration.

- set default mozconfig_variant in ci/build/kind.yml
- mozconfig_variant overrides need to be moved from mozharness/build/branch_specfics.py to ci/build/{linux,macosx,windows}.yml
- testing/mozharness/configs/builds/taskcluster_sub_win{32,64}/opt.py were removed from M-C, need to update ci/build/windows.yml, need to move those settings to ci/build/windows.yml

Comment 1

[Rob Lemley [:rjl]]

Attachment: Bug 1501526 - Move mozconfig_variant definitions to taskcluster config. rs=bustage-fix

Ported M-C Taskcluster updates from Bug 1497860 to C-C.

- set default mozconfig_variant in ci/build/kind.yml
- mozconfig_variant overrides need to be moved from
mozharness/build/branch_specfics.py to ci/build/{linux,macosx,windows}.yml
- testing/mozharness/configs/builds/taskcluster_sub_win{32,64}/opt.py were
removed from M-C, need to update ci/build/windows.yml, need to move those
settings to ci/build/windows.yml

Depends on D9603

Comment 2

[Rob Lemley [:rjl]]

The patch in Phabricator relies on the patch in bug 1501488 being applied first.

Comment 3

[Jorg K (CEST = GMT+2)]

Attachment: D9612.patch

Rebased for bug 1501488 but not working :-(

I get:
  File "c:\mozilla-source\comm-central\taskcluster\taskgraph\loader\multi_dep.py", line 165, in get_primary_dep
    assert len(dep_tasks) == 1, "Must define a primary-dependency!"
AssertionError: Must define a primary-dependency!

Can't be far off.

Comment 4

[Jorg K (CEST = GMT+2)]

Attachment: D9612.patch (v2)

Added custom-build-variant-cfg: debug back in as per Tom's comment.

Comment 5

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/comm-central/rev/5c2052f239d2
Port bug 1497860: Move mozconfig_variant definitions to taskcluster config. rs=bustage-fix

Comment 6

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/comm-central/rev/13f59980740f
Follow-up: Use 'mozconfig-variant: debug' for Mac as well. rs=bustage-fix

Comment 7

[Jorg K (CEST = GMT+2)]

Beta (TB 64 beta 2):
https://hg.mozilla.org/releases/comm-beta/rev/ef64cd0986cdc9cebdf0bcce2d46297cf653a53c (merged patch)

Comment 8

[Rob Lemley [:rjl]]

Attachment: mozconfig-release-for-beta

[Approval Request Comment]
Regression caused by (bug #): 1501526
User impact if declined: 
Testing completed (on c-c, etc.): 
Risk to taking this patch (and alternatives if risky):

This was missed in the initial porting from M-C. The problem only
affects C-B.

Comment 9

[Rob Lemley [:rjl]]

For the record, this wasn't caught on the try build because try falls through to the default of '':
https://hg.mozilla.org/mozilla-central/file/tip/taskcluster/taskgraph/decision.py#l233

which is then defaulted to "nightly" at https://hg.mozilla.org/comm-central/file/tip/taskcluster/ci/build/kind.yml#l52

New Try push:
https://treeherder.mozilla.org/#/jobs?repo=try-comm-central&revision=46a3829a7eafc4fdc0e597926db2f1ce8d97e0bf

Apparently what I needed was a try_task_config.json file with contents like:
{
  "version": 2,
  "parameters": {
    "optimize_target_tasks": false,
    "release_type": "beta",
    "target_tasks_method": "mozilla_beta_tasks"
  }
}

Comment 10

[Jorg K (CEST = GMT+2)]

(In reply to Rob Lemley [:rjl] from comment #8)
> This was missed in the initial porting from M-C. The problem only
> affects C-B.
But we need that on C-C as well, so it's right in the next beta, yes?

Comment 11

[Rob Lemley [:rjl]]

(In reply to Jorg K (GMT+2) from comment #10)
> But we need that on C-C as well, so it's right in the next beta, yes?

correct.

Comment 12

[Jorg K (CEST = GMT+2)]

OK, I'll land it on both when your try is done.

Comment 13

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/comm-central/rev/36dcdf4f2d5c
Follow-up: Use mozconfig-variant: release for beta. rs=bustage-fix DONTBUILD

Comment 14

[Jorg K (CEST = GMT+2)]

https://hg.mozilla.org/releases/comm-beta/rev/94d01c0399c9016ef9d91b284ff2f398c68a9580

Comment 15

[Jorg K (CEST = GMT+2)]

TB 60.5 ESR:
https://hg.mozilla.org/releases/comm-esr60/rev/bb428825e811283683bd431ef3dfbdee00c618c0
Merged patch from comment #5 and comment #6, but NOT comment #13.