bug 912278 - return cypress to normal twig; r=rail
authorHal Wine <hwine@mozilla.com>
Mon, 21 Oct 2013 15:48:13 -0700
changeset 9271 e107f872bcd89ea4ca6b122114911b576412fefd
parent 9269 1b063a6fe1c4d5c16a197eb01152bc17010e9d11
child 9274 0510a568491017fa18c1a670b7dd03cdad31b775
push id6928
push userhwine@mozilla.com
push dateMon, 21 Oct 2013 22:48:40 +0000
reviewersrail
bugs912278
bug 912278 - return cypress to normal twig; r=rail
mozilla/b2g_project_branches.py
mozilla/master_common.py
mozilla/project_branches.py
--- a/mozilla/b2g_project_branches.py
+++ b/mozilla/b2g_project_branches.py
@@ -11,20 +11,16 @@ PROJECT_BRANCHES = {
     'ionmonkey': {
         'enable_nightly': True
     },
     # Please sync any customizations made to mozilla-inbound to cypress.
     'mozilla-inbound': {
         'repo_path': 'integration/mozilla-inbound',
         'enable_perproduct_builds': True,
     },
-    # Customized to be the same as inbound. bug 866314
-    'cypress': {
-        'enable_perproduct_builds': True,
-    },
     'b2g-inbound': {
         'repo_path': 'integration/b2g-inbound',
         'enable_perproduct_builds': True,
         'platforms': {
             'macosx64_gecko': {
                 'enable_checktests': False,
             },
             'win32_gecko': {
@@ -50,16 +46,18 @@ PROJECT_BRANCHES = {
         'mozharness_repo_path': 'users/asasaki_mozilla.com/ash-mozharness',
         'mozharness_repo': 'http://hg.mozilla.org/users/asasaki_mozilla.com/ash-mozharness',
         'mozharness_tag': 'default',
     },
     'birch': {},
     'cedar': {
         'mozharness_tag': 'default',
     },
+    'cypress': {
+    },
     # B2G builds not required on date
     # 'date': {},
     # Customizations for windows update service changes (bug 481815)
     #'elm': {},
     'fig': {
         'lock_platforms': True,
         'platforms': {},
     },
--- a/mozilla/master_common.py
+++ b/mozilla/master_common.py
@@ -34,24 +34,23 @@ BRANCH_PRIORITIES = {
     'comm-beta': 2,
     'mozilla-central': 3,
     'comm-central': 3,
     'mozilla-aurora': 3,
     'comm-aurora': 3,
     # Unlisted branches are prioritized at this level
     'mozilla-inbound': 4,
     'b2g-inbound': 4,
-    # Cypress is also an inbound!
-    'cypress': 4,
     'try': 5,
     'try-comm-central': 5,
     'alder': 5,
     'ash': 5,
     'birch': 5,
     'cedar': 5,
+    'cypress': 5,
     'date': 5,
     'elm': 5,
     'fig': 5,
     'gum': 5,
     'holly': 5,
     'jamun': 5,
     'larch': 5,
     'maple': 5,
--- a/mozilla/project_branches.py
+++ b/mozilla/project_branches.py
@@ -23,41 +23,28 @@ PROJECT_BRANCHES = {
     'ionmonkey': {
         'mozconfig_dir': 'mozilla-central',
         'enable_nightly': True,
         'create_snippet': True,
         'create_partial': True,
         'pgo_strategy': 'periodic',
         'branch_projects': [ 'spidermonkey_tier_1', 'spidermonkey_info' ],
     },
-    # Please sync any customizations made to mozilla-inbound to cypress.
     'mozilla-inbound': {
         'repo_path': 'integration/mozilla-inbound',
         'enable_perproduct_builds': True,
         'mozconfig_dir': 'mozilla-central',
         'enable_weekly_bundle': True,
         'pgo_strategy': 'periodic',
         'periodic_pgo_interval': 3,
         'talos_suites': {
             'xperf': 1,
         },
         'branch_projects': [ 'spidermonkey_tier_1', 'spidermonkey_info' ],
     },
-    # Customized to be the same as inbound. bug 866314
-    'cypress': {
-        'enable_perproduct_builds': True,
-        'mozconfig_dir': 'mozilla-central',
-        'enable_weekly_bundle': True,
-        'pgo_strategy': 'periodic',
-        'periodic_pgo_interval': 3,
-        'talos_suites': {
-            'xperf': 1,
-        },
-        'branch_projects': [ 'spidermonkey_tier_1', 'spidermonkey_info' ],
-    },
     'b2g-inbound': {
         'repo_path': 'integration/b2g-inbound',
         'enable_perproduct_builds': True,
         'mozconfig_dir': 'mozilla-central',
         'pgo_strategy': 'periodic',
         'periodic_pgo_interval': 3,
         'enable_weekly_bundle': True,
         'talos_suites': {
@@ -207,16 +194,18 @@ PROJECT_BRANCHES = {
         'l10n_repo_path': 'l10n-central',
         'enUS_binaryURL': '/nightly/latest-cedar',
         'mobile_platforms': {
             'android-x86': {
                 'enable_opt_unittests': True,
             },
         },
     },
+    'cypress': {
+    },
     'date': {
         'lock_platforms': True,
         'platforms': {
             'win64': {
                 'enable_opt_unittests': True,
             },
             'win64-debug': {
                 'enable_debug_unittests': True,