Bug 1118796 - more setup for release promotion on date, r=bhearsum
--- a/configs/builds/branch_specifics.py
+++ b/configs/builds/branch_specifics.py
@@ -104,25 +104,46 @@ config = {
'repo_path': 'integration/mozilla-inbound',
},
'services-central': {
'repo_path': 'services/services-central',
},
'ux': {
"graph_server_branch_name": "UX",
},
+ # When build promotion goes live the mozconfig changes are probably better
+ # expressed once in files like configs/builds/releng_base_windows_32_builds.py
+ 'date': {
+ 'enable_release_promotion': 1,
+ 'platform_overrides': {
+ 'linux': {
+ 'src_mozconfig': 'browser/config/mozconfigs/linux32/beta',
+ },
+ 'linux64': {
+ 'src_mozconfig': 'browser/config/mozconfigs/linux64/beta',
+ },
+ 'macosx64': {
+ 'src_mozconfig': 'browser/config/mozconfigs/macosx-universal/beta',
+ },
+ 'win32': {
+ 'src_mozconfig': 'browser/config/mozconfigs/win32/beta',
+ },
+ 'win64': {
+ 'src_mozconfig': 'browser/config/mozconfigs/win64/beta',
+ },
+ },
+ },
### other branches that do not require anything special:
# 'alder': {},
# 'ash': {},
# 'birch': {},
# 'build-system': {}
# 'cedar': {},
# "cypress": {},
- # 'date': {},
# 'elm': {},
# 'fig': {},
# 'graphics': {}
# 'holly': {},
# 'jamun': {},
# 'larch': {},
# 'maple': {},
# 'oak': {},
--- a/mozharness/mozilla/building/buildbase.py
+++ b/mozharness/mozilla/building/buildbase.py
@@ -756,16 +756,20 @@ or run without that action (ie: --no-{ac
if c.get('enable_signing'):
moz_sign_cmd = subprocess.list2cmdline(
self.query_moz_sign_cmd(formats=None)
)
# windows fix. This is passed to mach build env and we call that
# with python, not with bash so we need to fix the slashes here
env['MOZ_SIGN_CMD'] = moz_sign_cmd.replace('\\', '\\\\\\\\')
+ # to activate the right behaviour in mozonfigs while we transition
+ if c.get('enable_release_promotion'):
+ env['ENABLE_RELEASE_PROMOTION'] = "1"
+
# we can't make env an attribute of self because env can change on
# every call for reasons like MOZ_SIGN_CMD
return env
def query_mach_build_env(self):
c = self.config
mach_env = {}
if c.get('upload_env'):