Bug 1116750 - Forcing a repack builder requires setting the specify script_repo_revision property, r=bhearsum
authorNick Thomas <nthomas@mozilla.com>
Mon, 21 Sep 2015 15:15:08 +1200 (2015-09-21)
changeset 4460 3af7c68dfe1233fc6cb0d5520038a80b63c3161d
parent 4459 36d0dbbccd2af7a7c20f30efae0d6691d989bb0b
child 4461 40e466a477a570e0a4b5e4b493e5ac4d7a4ad162
push id3731
push usernthomas@mozilla.com
push dateMon, 21 Sep 2015 03:27:09 +0000 (2015-09-21)
reviewersbhearsum
bugs1116750
Bug 1116750 - Forcing a repack builder requires setting the specify script_repo_revision property, r=bhearsum
process/release.py
--- a/process/release.py
+++ b/process/release.py
@@ -829,30 +829,30 @@ def generateReleaseBranchObjects(release
                     'builddir': builddir,
                     'slavebuilddir': normalizeName(builddir, releaseConfig['productName']),
                     'release_config': releaseConfigFile,
                     'platform': platform,
                     'branch': 'release-%s' % sourceRepoInfo['name'],
                     'chunkTotal': int(l10nChunks),
                     'chunkNum': int(n),
                     'event_group': 'repack',
+                    'script_repo_revision': releaseTag,
                 }
                 if hasPlatformSubstring(platform, 'android'):
                     extra_args = releaseConfig['single_locale_options'][platform] + ['--cfg', branchConfig['mozharness_configs']['balrog'], '--total-chunks', str(l10nChunks), '--this-chunk', str(n)]
                     repack_factory = SigningScriptFactory(
                         signingServers=getSigningServers(platform),
                         scriptRepo=mozharness_repo,
                         scriptName='scripts/mobile_l10n.py',
                         extra_args=extra_args,
                         use_credentials_file=True,
                         env=env,
                         relengapi_archiver_repo_path=relengapi_archiver_repo_path,
                         relengapi_archiver_release_tag=releaseTag,
                     )
-                    properties['script_repo_revision'] = releaseTag
                 else:
                     extra_args = [platform, branchConfigFile]
                     extra_args.extend([
                         '--chunks', str(l10nChunks), '--this-chunk', str(n),
                         '--stage-ssh-key', branchConfig['stage_ssh_key'],
                         '--stage-server', branchConfig['stage_server'],
                         '--stage-username', branchConfig['stage_username'],
                         '--hghost', branchConfig['hghost'],
@@ -1748,17 +1748,17 @@ def generateReleaseBranchObjects(release
                 builderPrefix('%s_tag_l10n' % releaseConfig['productName']),
             ]
 
             repack_scheduler = AggregatingScheduler(
                  name=builderPrefix('%s_repack' % platform),
                  branch=sourceRepoInfo['path'],
                  upstreamBuilders=repack_upstream,
                  builderNames=l10nBuilderNames,
-                 properties={'script_repo_revision': releaseTag, },)
+            )
 
             schedulers.append(repack_scheduler)
             repack_complete_scheduler = AggregatingScheduler(
                 name=builderPrefix('%s_repack_complete' % platform),
                 branch=sourceRepoInfo['path'],
                 upstreamBuilders=l10nBuilderNames,
                 builderNames=[builderPrefix('repack_complete', platform), ]
             )