Bug 1179476 - use in gecko tree mozharness across all jobs, release tag fix for MBF, r=nthomas
--- a/process/factory.py
+++ b/process/factory.py
@@ -836,16 +836,17 @@ class MercurialBuildFactory(MozillaBuild
gaiaRepo=None,
gaiaRevision=None,
gaiaRevisionFile=None,
gaiaLanguagesFile=None,
gaiaLanguagesScript=None,
gaiaL10nRoot=None,
geckoL10nRoot=None,
geckoLanguagesFile=None,
+ relengapi_archiver_release_tag=None,
**kwargs):
MozillaBuildFactory.__init__(self, **kwargs)
# Make sure we have a buildid and builduid
self.addStep(FunctionalStep(
name='set_buildids',
func=setBuildIDProps,
))
@@ -913,16 +914,17 @@ class MercurialBuildFactory(MozillaBuild
self.gaiaL10nRoot = gaiaL10nRoot
self.gaiaL10nBaseDir = WithProperties('%(basedir)s/build-gaia-l10n')
self.compareLocalesRepoPath = compareLocalesRepoPath
self.compareLocalesTag = compareLocalesTag
self.multiLocaleScript = multiLocaleScript
self.multiLocaleConfig = multiLocaleConfig
self.multiLocaleMerge = multiLocaleMerge
self.tools_repo_cache = tools_repo_cache
+ self.relengapi_archiver_release_tag = relengapi_archiver_release_tag
assert len(self.tooltool_url_list) <= 1, "multiple urls not currently supported by tooltool"
if self.uploadPackages:
assert productName and stageServer and stageUsername
assert stageBasePath
self.complete_platform = self.platform
@@ -1075,16 +1077,20 @@ class MercurialBuildFactory(MozillaBuild
if self.enable_ccache:
self.addStep(ShellCommand(command=['ccache', '-s'],
name="print_ccache_stats", warnOnFailure=False,
flunkOnFailure=False, haltOnFailure=False, env=self.env))
if self.buildsBeforeReboot and self.buildsBeforeReboot > 0:
self.addPeriodicRebootSteps()
def addMozharnessRepoSteps(self):
+ if self.relengapi_archiver_release_tag:
+ archiver_revision = "--tag %s " % self.relengapi_archiver_release_tag
+ else:
+ archiver_revision = "--rev %(revision)s "
if self.mozharness_repo_cache:
assert self.tools_repo_cache
archiver_client_path = \
os.path.join(self.tools_repo_cache,
'buildfarm',
'utils',
'archiver_client.py')
else:
@@ -1109,17 +1115,17 @@ class MercurialBuildFactory(MozillaBuild
))
self.addStep(ShellCommand(
name="download_and_extract_mozharness_archive",
command=['bash', '-c',
WithProperties(
'python %s ' % archiver_client_path +
'mozharness ' +
'--repo %s ' % self.repoPath +
- '--rev %(revision)s ' +
+ archiver_revision +
'--debug')],
log_eval_func=rc_eval_func({0: SUCCESS, None: EXCEPTION}),
workdir='.',
haltOnFailure=True,
))
def addMultiLocaleRepoSteps(self):
name = self.compareLocalesRepoPath.rstrip('/').split('/')[-1]
--- a/process/release.py
+++ b/process/release.py
@@ -760,16 +760,17 @@ def generateReleaseBranchObjects(release
stagePlatform=buildbot2ftp(platform),
multiLocale=bool(releaseConfig.get('enableMultiLocale', False) and
pf.get('multi_locale', False)),
multiLocaleMerge=releaseConfig.get('mergeLocales', False),
compareLocalesRepoPath=branchConfig[
'compare_locales_repo_path'],
mozharnessRepoPath=mozharness_repo_path,
mozharnessTag=releaseTag,
+ relengapi_archiver_release_tag=releaseTag,
multiLocaleScript=pf.get('multi_locale_script'),
multiLocaleConfig=multiLocaleConfig,
mozharnessMultiOptions=mozharnessMultiOptions,
usePrettyNames=releaseConfig.get('usePrettyNames', True),
enableUpdatePackaging=releaseConfig.get(
'enableUpdatePackaging', True),
signingServers=getSigningServers(platform),
createPartial=releaseConfig.get(