Bug 1258059 - bbot-cfgs - 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:30:01 -0700
changeset 13963 2bd36ee4caac126be727fdcfc5812caf3d439f47
parent 13962 cc6666ea9bd624f8b7755b2e5ae2eede34369480
child 13966 dbe462ee27969953abcd295f1b399a53a53f4dab
push id32
push userjlund@mozilla.com
push dateTue, 22 Mar 2016 04:31:11 +0000
reviewersrail
bugs1258059
Bug 1258059 - bbot-cfgs - generify dev configs and env for relpro by removing date strings and allow multiple products, r?rail MozReview-Commit-ID: AtcT1JeBFAv
mozilla/config.py
mozilla/project_branches.py
--- a/mozilla/config.py
+++ b/mozilla/config.py
@@ -2697,20 +2697,32 @@ BRANCHES['mozilla-beta']['platforms']['a
 BRANCHES['mozilla-beta']['platforms']['android-api-15-debug']['enable_dep'] = True
 BRANCHES['mozilla-beta']['platforms']['macosx64']['platform_objdir'] = "%s/x86_64" % OBJDIR
 BRANCHES['mozilla-beta']['enabled_products'] = ['firefox', 'mobile']
 BRANCHES['mozilla-beta']['enable_perproduct_builds'] = True
 ### Release Promotion
 BRANCHES['mozilla-beta']['enable_release_promotion'] = True
 # used by process/release.py
 BRANCHES['mozilla-beta']['tuxedoServerUrl'] = "https://bounceradmin.mozilla.com/api"
-BRANCHES['mozilla-beta']['bouncer_submitter_config'] = "releases/bouncer_firefox_beta.py"
+BRANCHES['mozilla-beta']['bouncer_submitter_config'] = {
+    "firefox": "releases/bouncer_firefox_beta.py",
+    # TODO - fennec
+    "fennec": "",
+}
 BRANCHES['mozilla-beta']['bouncer_branch'] = "releases/mozilla-beta"
-BRANCHES['mozilla-beta']['postrelease_version_bump_config'] = "releases/postrelease_beta.py"
-BRANCHES['mozilla-beta']['updates_config'] = "releases/updates_date.py"
+BRANCHES['mozilla-beta']['postrelease_version_bump_config'] = {
+    "firefox": 'releases/postrelease_firefox_beta.py',
+    # TODO - fennec
+    "fennec": "",
+}
+BRANCHES['mozilla-beta']['updates_config'] = {
+    "firefox": 'releases/updates_firefox_beta.py',
+    # TODO - fennec
+    "fennec": "",
+}
 BRANCHES['mozilla-beta']['update_verify_chunks'] = 6
 BRANCHES['mozilla-beta']['beetmover_credentials'] = "/builds/release-s3.credentials"
 BRANCHES['mozilla-beta']['stage_product'] = {
     'firefox': 'firefox',
     'fennec': 'mobile'
 }
 BRANCHES['mozilla-beta']['platforms']['linux']['dep_signing_servers'] = 'release-signing'
 BRANCHES['mozilla-beta']['platforms']['linux64']['dep_signing_servers'] = 'release-signing'
--- a/mozilla/project_branches.py
+++ b/mozilla/project_branches.py
@@ -145,28 +145,42 @@ PROJECT_BRANCHES = {
         'enable_valgrind': False,
         'pgo_strategy': 'per-checkin',
         'enable_release_promotion': True,
         'build_tools_repo_path': 'users/raliiev_mozilla.com/tools',
         'partners_repo_path': 'build/partner-repacks',
         'partner_repack_platforms': ('linux', 'linux64', 'win32', 'win64', 'macosx64'),
         "release_platforms": ("linux", "linux64", "win32", "win64", "macosx64"),
         "l10n_release_platforms": ("linux", "linux64", "win32", "win64", "macosx64"),
-        "release_channel_mappings": [["^.*$", ["date"]]],
+        "release_channel_mappings": [["^.*$", ["beta-dev"]]],
         # temp balrog
         'balrog_api_root': 'http://ec2-54-241-39-23.us-west-1.compute.amazonaws.com:443/api',
         'funsize_balrog_api_root': 'http://ec2-54-241-39-23.us-west-1.compute.amazonaws.com:443/api',
         'tuxedoServerUrl': 'https://admin-bouncer.stage.mozaws.net/api',
-        'bouncer_submitter_config': "releases/bouncer_firefox_date.py",
+        'bouncer_submitter_config': {
+            "firefox": "releases/dev_bouncer_firefox_beta.py",
+            # TODO - fennec
+            "fennec": "",
+        },
+        # TODO - is this used? seems like an invalid value and bouncer_submitter.py doesn't
+        # contain any usages with 'branch'
         'bouncer_branch': "releases/date",
         'bouncer_enabled': True,
         'postrelease_version_bump_enabled': True,
-        'postrelease_version_bump_config': 'releases/postrelease_date.py',
+        'postrelease_version_bump_config': {
+            "firefox": 'releases/dev_postrelease_firefox_beta.py',
+            # TODO - fennec
+            "fennec": "",
+        },
         'push_to_candidates_enabled': True,
-        'updates_config': 'releases/updates_date.py',
+        'updates_config': {
+            "firefox": 'releases/dev_updates_firefox_beta.py',
+            # TODO - fennec
+            "fennec": "",
+        },
         'update_verify_chunks': 6,
         'beetmover_credentials': '/builds/dev-beetmover-s3.credentials',
         'beetmover_buckets': {
             'firefox': 'net-mozaws-stage-delivery-firefox',
             # TODO - add fennec support
             # 'fennec': 'net-mozaws-stage-delivery-archive',
         },
         'stage_product': {