Bug 787208 - Fix cypress repo_path by using common defaults. r=jlund
--- a/mozilla-tests/thunderbird_config.py
+++ b/mozilla-tests/thunderbird_config.py
@@ -1,16 +1,16 @@
from copy import deepcopy
from config import BRANCH_UNITTEST_VARS, MOZHARNESS_REBOOT_CMD
from localconfig import SLAVES, TRY_SLAVES, GLOBAL_VARS
import config_common
reload(config_common)
-from config_common import delete_slave_platform
+from config_common import loadDefaultValues, delete_slave_platform
import thunderbird_localconfig
reload(thunderbird_localconfig)
import master_common
reload(master_common)
from master_common import setMainCommVersions, items_before, items_at_least
import thunderbird_project_branches
reload(thunderbird_project_branches)
@@ -467,26 +467,21 @@ for _, branch in items_at_least(BRANCHES
"https://hg.mozilla.org/%(moz_repo_path)s/raw-file/default/" + \
"testing/mozharness/mozharness.json"
# mozharness_archiver_repo_path tells the factory to use a copy of mozharness from within the
# gecko tree and also allows us to overwrite which gecko repo to use. Useful for platforms
# like Thunderbird
branch['mozharness_archiver_repo_path'] = '%(moz_repo_path)s'
branch['mozharness_archiver_rev'] = 'default'
-# Cypress is the m-c in c-c repo, so set some specifics
-BRANCHES['cypress']['mozharness_archiver_repo_path'] = '%(repo_path)s'
+#Setup Cypress based on default values first
+loadDefaultValues(BRANCHES, cypress, BRANCHES['cypress'])
if 'mozharness_archiver_rev' in BRANCHES['cypress']:
# Without this retriggers wouldn't use the repo rev for mozharness.
del BRANCHES['cypress']['mozharness_archiver_rev']
-BRANCHES['cypress']['script_repo_manifest'] = \
- "https://hg.mozilla.org/%(repo_path)s/raw-file/%(revision)s/" + \
- "testing/mozharness/mozharness.json"
-BRANCHES['cypress']['pgo_strategy'] = None
-
if __name__ == "__main__":
import sys
import pprint
args = sys.argv[1:]
if len(args) > 0: