diff options
| author | noelallen@google.com <noelallen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-15 23:39:08 +0000 |
|---|---|---|
| committer | noelallen@google.com <noelallen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-15 23:39:08 +0000 |
| commit | 24469df740672071da7cb0a44386fff9d9cacb7f (patch) | |
| tree | 3205b017b12f171eeb6563cdec4539d7570b8bbf /native_client_sdk | |
| parent | a592475ac8e27eed69fa909a11b87bcbb5764e5e (diff) | |
| download | chromium_src-24469df740672071da7cb0a44386fff9d9cacb7f.zip chromium_src-24469df740672071da7cb0a44386fff9d9cacb7f.tar.gz chromium_src-24469df740672071da7cb0a44386fff9d9cacb7f.tar.bz2 | |
Update SDK build scripts to green tree.
Fix path issue with path to gsutil which is unused by trys.
This CL should only affect SDK bots, not Chrome.
Commiting TBR to green SDK tree.
BUG=109207
TBR= bradnelson@chromium.org
Review URL: http://codereview.chromium.org/9179004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117823 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'native_client_sdk')
| -rwxr-xr-x | native_client_sdk/src/build_tools/buildbot_run.py | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/native_client_sdk/src/build_tools/buildbot_run.py b/native_client_sdk/src/build_tools/buildbot_run.py index ce94f07..b3739a4 100755 --- a/native_client_sdk/src/build_tools/buildbot_run.py +++ b/native_client_sdk/src/build_tools/buildbot_run.py @@ -66,9 +66,17 @@ def Archive(filename): bucket_path = 'nativeclient-mirror/nacl/nacl_sdk/%s/%s' % ( chrome_version, filename) full_dst = 'gs://%s' % bucket_path + + if os.environ.get('BUILDBOT_BUILDERNAME', ''): + # For buildbots assume gsutil is stored in the build directory. + gsutil = '/b/build/scripts/slave/gsutil' + else: + # For non buildpots, you must have it in your path. + gsutil = 'gsutil' + subprocess.check_call( - 'gsutil cp -a public-read %s %s' % ( - filename, full_dst), shell=True, cwd=OUT_DIR) + '%s cp -a public-read %s %s' % ( + gsutil, filename, full_dst), shell=True, cwd=OUT_DIR) url = 'https://commondatastorage.googleapis.com/%s' % bucket_path print '@@@STEP_LINK@download@%s@@@' % url sys.stdout.flush() @@ -263,6 +271,7 @@ def main(): skip_examples = 0 skip_headers = 0 skip_make = 0 + force_archive = 0 pepper_ver = build_utils.ChromeMajorVersion() clnumber = lastchange.FetchVersionInfo(None).revision @@ -354,7 +363,7 @@ def main(): 'pepper_' + pepper_ver], cwd=NACL_DIR) # Archive on non-trybots. - if '-sdk' in os.environ.get('BUILDBOT_BUILDERNAME', ''): + if force_archive or '-sdk' in os.environ.get('BUILDBOT_BUILDERNAME', ''): BuildStep('Archive build') Archive(tarname) |