Closed Bug 615097 Opened 11 years ago Closed 11 years ago

config.py shouldn't depend on non Python libraries

Categories

(Release Engineering :: General, defect)

defect
Not set
blocker

Tracking

(Not tracked)

RESOLVED FIXED

People

(Reporter: rail, Assigned: salbiz)

References

Details

(Whiteboard: [automation])

Attachments

(3 files)

Attached patch Hacky patchSplinter Review
Bug 588150 introduced an new import in config.py which prevents readBranchConfig from [1] evaluating of the content of config.py, which we use for reconfigless slave side scripts, which don't have buildbot master libraries.

It would be great if we avoid external dependencies or wrap the imported classes/functions to allow evaluating config.py without ImportErrors.

1. http://hg.mozilla.org/build/tools/file/aac57c95e2ed/lib/python/release/info.py#l62

The attached patch is a hacky way to resolve the current situation which prevents running release l10n repacks and landing some other release automation related patches.
Attachment #493561 - Flags: feedback?(catlee)
Assigning to Syed. According to the IRC conversation, he is going to move the logic to the factories.
Assignee: rail → salbiz
This patch deals with what is currently the only offender in config.py by moving it into the constructor of MercurialBuildFactory. dump_masters.sh output with this change seems fine.
Attachment #493778 - Flags: feedback?(rail)
Attachment #493778 - Flags: feedback?(catlee)
Comment on attachment 493778 [details] [diff] [review]
set ccache basedir inside buildfactory rather than config.py

Looks good to me. Don't forget to remove the corresponding entry from config.py ;)
Attachment #493778 - Flags: feedback?(rail) → feedback+
If I understand correctly, this bug blocks 3.6.13 build2 l10n repacks. Setting as "blocker".
Severity: normal → blocker
Status: NEW → ASSIGNED
Comment on attachment 493561 [details] [diff] [review]
Hacky patch

This is the safest thing that will let us start 3.6.13/3.5.16build2, r+.
Attachment #493561 - Flags: feedback?(catlee) → feedback+
Comment on attachment 493561 [details] [diff] [review]
Hacky patch

changeset:   3386:6cf865c6e3a0
Attachment #493561 - Flags: review+
Attachment #493561 - Flags: checked-in+
I've also backed out the other fix in this patch. Since there shouldn't be any need for it in the future once 3.5.16 is finished and the patch to move the ccache_basedir into the build factory has landed. output of dump-masters.sh and config.py looks good.
Attachment #493981 - Flags: feedback?(rail)
Attachment #493981 - Flags: feedback?(catlee)
Comment on attachment 493981 [details] [diff] [review]
remove temporary fix & WithProperties statements

Looks good
Attachment #493981 - Flags: feedback?(rail) → feedback+
Attachment #493778 - Flags: feedback?(catlee) → feedback+
Attachment #493981 - Flags: feedback?(catlee) → feedback+
Attachment #493778 - Flags: review?(rail)
Attachment #493778 - Flags: review?(catlee)
Comment on attachment 493981 [details] [diff] [review]
remove temporary fix & WithProperties statements

Tested a linux build, BASEDIR looks good.
Attachment #493981 - Flags: review?(rail)
Attachment #493981 - Flags: review?(catlee)
Attachment #493778 - Flags: review?(rail) → review+
Attachment #493981 - Flags: review?(rail) → review+
Attachment #493778 - Flags: review?(catlee) → review+
Attachment #493981 - Flags: review?(catlee) → review+
Flags: needs-reconfig?
Comment on attachment 493981 [details] [diff] [review]
remove temporary fix & WithProperties statements

Landed in changeset:   3609:fc3a0690fad5, merged to the production branch in 3610:e5262b6572a3
Attachment #493981 - Flags: checked-in+
Comment on attachment 493778 [details] [diff] [review]
set ccache basedir inside buildfactory rather than config.py

Landed in changeset:   1249:f48ae5f00010, merged to the production-0.8 branch in 1250:30537b778f04
Attachment #493778 - Flags: checked-in+
Status: ASSIGNED → RESOLVED
Closed: 11 years ago
Flags: needs-reconfig?
Resolution: --- → FIXED
Product: mozilla.org → Release Engineering
You need to log in before you can comment on or make changes to this bug.