123.diff

commit 7878c3423775bb419c1cd5b7c4e324b4ac572986
Author: Rail Aliiev <rail@mozilla.com>
Date:   Tue Feb 5 10:19:34 2013 -0500

    no ubuntu32-b2g

diff --git a/mozilla-tests/BuildSlaves.py.template b/mozilla-tests/BuildSlaves.py.template
index 4a93e52..5055aea 100644
--- a/mozilla-tests/BuildSlaves.py.template
+++ b/mozilla-tests/BuildSlaves.py.template
@@ -20,7 +20,6 @@ SlavePasswords = {
     "panda_android": "pass",
     "b2g_panda": "pass",
     "ubuntu32": "pass",
-    "ubuntu32-b2g": "pass",
     "ubuntu64": "pass",
     "b2g_panda_gaia_central": "pass",
 }
diff --git a/mozilla-tests/b2g_config.py b/mozilla-tests/b2g_config.py
index 39f1e30..6f42621 100644
--- a/mozilla-tests/b2g_config.py
+++ b/mozilla-tests/b2g_config.py
@@ -34,10 +34,10 @@ PLATFORMS = {
 
 builder_prefix = "b2g"
 
-PLATFORMS['ics_armv7a_gecko']['slave_platforms'] = ['fedora-b2g', 'ubuntu32-b2g']
+PLATFORMS['ics_armv7a_gecko']['slave_platforms'] = ['fedora-b2g', 'ubuntu32']
 PLATFORMS['ics_armv7a_gecko']['env_name'] = 'linux-perf'
 PLATFORMS['ics_armv7a_gecko']['fedora-b2g'] = {'name': builder_prefix + "_ics_armv7a_gecko_emulator"}
-PLATFORMS['ics_armv7a_gecko']['ubuntu32-b2g'] = {'name': builder_prefix + "_ics_armv7a_gecko_emulator_ubuntu32"}
+PLATFORMS['ics_armv7a_gecko']['ubuntu32'] = {'name': builder_prefix + "_ics_armv7a_gecko_emulator_ubuntu32"}
 PLATFORMS['ics_armv7a_gecko']['stage_product'] = 'b2g'
 PLATFORMS['ics_armv7a_gecko']['mozharness_config'] = {
     'mozharness_python': '/tools/buildbot/bin/python',
@@ -380,7 +380,7 @@ PLATFORM_UNITTEST_VARS = {
                 },
             },
         },
-        'ubuntu32-b2g': {
+        'ubuntu32': {
             'opt_unittest_suites': UNITTEST_SUITES['opt_unittest_suites'][:],
             'debug_unittest_suites': UNITTEST_SUITES['debug_unittest_suites'][:],
             'suite_config': {
@@ -664,9 +664,9 @@ BRANCHES['cedar']['branch_name'] = "Cedar"
 BRANCHES['cedar']['repo_path'] = "projects/cedar"
 BRANCHES['cedar']['mozharness_tag'] = "default"
 BRANCHES['cedar']['platforms']['ics_armv7a_gecko']['fedora-b2g']['debug_unittest_suites'] = ALL_UNITTESTS[:]
-BRANCHES['cedar']['platforms']['ics_armv7a_gecko']['ubuntu32-b2g']['debug_unittest_suites'] = [x for x in ALL_UNITTESTS if x not in CRASHTEST_ONLY + REFTEST_ONLY]
+BRANCHES['cedar']['platforms']['ics_armv7a_gecko']['ubuntu32']['debug_unittest_suites'] = [x for x in ALL_UNITTESTS if x not in CRASHTEST_ONLY + REFTEST_ONLY]
 BRANCHES['cedar']['platforms']['ics_armv7a_gecko']['enable_debug_unittests'] = True
-BRANCHES['cedar']['platforms']['ics_armv7a_gecko']['slave_platforms'] = ['fedora-b2g', 'ubuntu32-b2g']
+BRANCHES['cedar']['platforms']['ics_armv7a_gecko']['slave_platforms'] = ['fedora-b2g', 'ubuntu32']
 BRANCHES['fx-team']['repo_path'] = "integration/fx-team"
 BRANCHES['mozilla-b2g18']['repo_path'] = "releases/mozilla-b2g18"
 BRANCHES['mozilla-b2g18']['platforms']['ics_armv7a_gecko']['fedora-b2g']['opt_unittest_suites'] = [x for x in ALL_UNITTESTS if x not in CRASHTEST_ONLY]
@@ -935,10 +935,10 @@ for branch in BRANCHES.keys():
 # Disable ubuntu on non cedar branches
 for branch in set(BRANCHES.keys()) - set(['cedar']):
     for platform in BRANCHES[branch]['platforms']:
-        if 'ubuntu32-b2g' in BRANCHES[branch]['platforms'][platform]['slave_platforms']:
-            BRANCHES[branch]['platforms'][platform]['slave_platforms'].remove('ubuntu32-b2g')
-        if 'ubuntu32-b2g' in BRANCHES[branch]['platforms'][platform]:
-            del BRANCHES[branch]['platforms'][platform]['ubuntu32-b2g']
+        if 'ubuntu32' in BRANCHES[branch]['platforms'][platform]['slave_platforms']:
+            BRANCHES[branch]['platforms'][platform]['slave_platforms'].remove('ubuntu32')
+        if 'ubuntu32' in BRANCHES[branch]['platforms'][platform]:
+            del BRANCHES[branch]['platforms'][platform]['ubuntu32']
 
 
 if __name__ == "__main__":
diff --git a/mozilla-tests/production_config.py b/mozilla-tests/production_config.py
index a6db5c1..b64144d 100644
--- a/mozilla-tests/production_config.py
+++ b/mozilla-tests/production_config.py
@@ -26,7 +26,6 @@ SLAVES['leopard-o'] = SLAVES['leopard']
 SLAVES['tegra_android-armv6'] = SLAVES['tegra_android']
 SLAVES['tegra_android-noion'] = SLAVES['tegra_android']
 SLAVES['fedora-b2g'] = SLAVES['fedora']
-SLAVES['ubuntu32-b2g'] = SLAVES['ubuntu32']
 SLAVES['b2g_panda_gaia_central'] = SLAVES['b2g_panda']
 
 TRY_SLAVES = {}