Remove base-* directories from gm expected/actual paths; just use platform names

BUG=skia:1512

The buildbot master continues to set gm_image_subdir, but the slaves no longer
use that component when building GM paths (they just use builder_name instead).
But gm_image_subdir is still used for SKP storage paths under
gs://chromium-skia-gm/playback/gm-actual , for now...

Immediately before committing this CL, I will copy the actual-results.json files
from their old locations to their new locations (within the skia-autogen repo)
so that both old and new versions of rebaseline.py will be able to retrieve
actual results, like so:

svn cp base-android-galaxy-nexus/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/base-android-galaxy-nexus Test-Android-GalaxyNexus-SGX540-Arm7-Debug
svn cp base-android-galaxy-nexus/Test-Android-GalaxyNexus-SGX540-Arm7-Release/base-android-galaxy-nexus Test-Android-GalaxyNexus-SGX540-Arm7-Release
svn cp base-android-nexus-10/Test-Android-Nexus10-MaliT604-Arm7-Debug/base-android-nexus-10 Test-Android-Nexus10-MaliT604-Arm7-Debug
...
svn cp base-shuttle-win7-intel-float/Test-Win7-ShuttleA-HD2000-x86-Debug/base-shuttle-win7-intel-float Test-Win7-ShuttleA-HD2000-x86-Debug
svn cp base-shuttle-win7-intel-float/Test-Win7-ShuttleA-HD2000-x86-Release/base-shuttle-win7-intel-float Test-Win7-ShuttleA-HD2000-x86-Release


Once we see this CL land successfully, I will delete the actual-results.json
files from their OLD location within skia-autogen, like so:

svn rm base-android-galaxy-nexus
svn rm base-android-nexus-10
...
svn rm base-shuttle-win7-intel-directwrite
svn rm base-shuttle-win7-intel-float

R=borenet@google.com, rmistry@google.com

Review URL: https://codereview.chromium.org/23120002

git-svn-id: http://skia.googlecode.com/svn/trunk@10821 2bbb7eff-a529-9590-31e7-b0007b416f81

1 files changed, 3 insertions, 10 deletions

diff --git a/tools/submit_try b/tools/submit_try
index d135675797..bad1c77cbd 100755
--- a/tools/submit_try
+++ b/tools/submit_try
@@ -21,14 +21,7 @@ import subprocess
 import svn
 import sys
 
-
-GLOBAL_VARIABLES = json.loads(svn.Cat('http://skia.googlecode.com/svn/'
-                                      'buildbot/site_config/'
-                                      'global_variables.json'))
-
-
-def GetGlobalVariable(var_name):
-  return GLOBAL_VARIABLES[var_name]['value']
+import buildbot_globals
 
 
 # Alias which can be used to run a try on every builder.
@@ -43,8 +36,8 @@ REGEX = 'regex'
 ALL_ALIASES = [ALL_BUILDERS, COMPILE_BUILDERS, CQ_BUILDERS, REGEX]
 
 # Contact information for the build master.
-SKIA_BUILD_MASTER_HOST = str(GetGlobalVariable('master_host'))
-SKIA_BUILD_MASTER_PORT = str(GetGlobalVariable('external_port'))
+SKIA_BUILD_MASTER_HOST = str(buildbot_globals.Get('master_host'))
+SKIA_BUILD_MASTER_PORT = str(buildbot_globals.Get('external_port'))
 
 # All try builders have this suffix.
 TRYBOT_SUFFIX = '-Trybot'