Bug 1258059 - bbotcustom - generify dev configs and env for relpro by removing date strings and allow multiple products, r?rail draft
authorJordan Lund <jlund@mozilla.com>
Mon, 21 Mar 2016 15:26:00 -0700
changeset 4495 c3f409116cdafc1045eaead8f394189776c16bcb
parent 4493 40258e329c781f63a28aba559fecde4d3ce5fdc0
child 4496 c9c3a7f0c18a56338cac9573cd952dcb9a6ffb25
push id3621
push userjlund@mozilla.com
push dateTue, 22 Mar 2016 04:30:31 +0000
reviewersrail
bugs1258059
Bug 1258059 - bbotcustom - generify dev configs and env for relpro by removing date strings and allow multiple products, r?rail MozReview-Commit-ID: FbM7hXZWQBM
process/release.py
--- a/process/release.py
+++ b/process/release.py
@@ -1808,17 +1808,17 @@ def generateReleasePromotionBuilders(bra
                 "product": product,
             },
         }
         builders.append(l10n_builder)
 
     bouncer_mh_cfg = {
         "script_name": "scripts/bouncer_submitter.py",
         "extra_args": [
-             "-c",  branch_config['bouncer_submitter_config'],
+             "-c",  branch_config['bouncer_submitter_config'][product],
              "--credentials-file", "oauth.txt",
              "--bouncer-api-prefix", branch_config['tuxedoServerUrl'],
              "--repo", branch_config['repo_path'],
         ]
     }
 
     bouncer_buildername = "release-{branch}_{product}_bncr_sub".format(
         branch=branch_name, product=product)
@@ -1871,17 +1871,17 @@ def generateReleasePromotionBuilders(bra
                     "product": product,
                 }
         }
         builders.append(uv_builder)
 
     updates_mh_cfg = {
         "script_name": "scripts/release/updates.py",
         "extra_args": [
-             "-c",  branch_config['updates_config'],
+             "-c",  branch_config['updates_config'][product],
         ]
     }
     updates_buildername = "release-{branch}-{product}_updates".format(
         branch=branch_name, product=product)
     # Explicitly define pf using the slave platform (linux64 in this case)
     updates_factory = makeMHFactory(
         config=branch_config, pf=branch_config["platforms"]['linux64'],
         mh_cfg=updates_mh_cfg, use_credentials_file=True)
@@ -1899,17 +1899,17 @@ def generateReleasePromotionBuilders(bra
             "product": product,
         }
     }
     builders.append(updates_builder)
 
     version_bump_mh_cfg = {
         "script_name": "scripts/release/postrelease_version_bump.py",
         "extra_args": [
-             "-c",  branch_config['postrelease_version_bump_config'],
+             "-c",  branch_config['postrelease_version_bump_config'][product],
         ]
     }
     version_bump_buildername = "release-{branch}-{product}_version_bump".format(
         branch=branch_name, product=product)
     # Explicitly define pf using the slave platform (linux64 in this case)
     version_bump_submitter_factory = makeMHFactory(
         config=branch_config, pf=branch_config["platforms"]['linux64'],
         mh_cfg=version_bump_mh_cfg, use_credentials_file=True)