diff options
Diffstat (limited to 'cros_utils')
| -rw-r--r-- | cros_utils/buildbot_utils.py | 465 | ||||
| -rwxr-xr-x | cros_utils/buildbot_utils_unittest.py | 117 | ||||
| -rw-r--r-- | cros_utils/chromeos-toolchain-credentials.json | 12 | ||||
| -rw-r--r-- | cros_utils/misc.py | 3 | ||||
| -rw-r--r-- | cros_utils/toolchain_utils.sh | 32 |
5 files changed, 303 insertions, 326 deletions
diff --git a/cros_utils/buildbot_utils.py b/cros_utils/buildbot_utils.py index f89bb71a..911ea03e 100644 --- a/cros_utils/buildbot_utils.py +++ b/cros_utils/buildbot_utils.py @@ -1,36 +1,25 @@ -# Copyright 2016 The Chromium OS Authors. All rights reserved. +# Copyright 2017 The Chromium OS Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. """Utilities for launching and accessing ChromeOS buildbots.""" from __future__ import print_function -import base64 +import ast import json import os import re import time -import urllib2 - -# pylint: disable=no-name-in-module -from oauth2client.service_account import ServiceAccountCredentials from cros_utils import command_executer from cros_utils import logger -from cros_utils import buildbot_json INITIAL_SLEEP_TIME = 7200 # 2 hours; wait time before polling buildbot. SLEEP_TIME = 600 # 10 minutes; time between polling of buildbot. -TIME_OUT = 28800 # Decide the build is dead or will never finish -# after this time (8 hours). -OK_STATUS = [ # List of result status values that are 'ok'. - # This was obtained from: - # https://chromium.googlesource.com/chromium/tools/build/+/ - # master/third_party/buildbot_8_4p1/buildbot/status/results.py - 0, # "success" - 1, # "warnings" - 6, # "retry" -] + +# Some of our slower builders (llmv-next) are taking more +# than 8 hours. So, increase this TIME_OUT to 9 hours. +TIME_OUT = 32400 # Decide the build is dead or will never finish class BuildbotTimeout(Exception): @@ -38,330 +27,180 @@ class BuildbotTimeout(Exception): pass -def ParseReportLog(url, build): - """Scrape the trybot image name off the Reports log page. - - This takes the URL for a trybot Reports Stage web page, - and a trybot build type, such as 'daisy-release'. It - opens the web page and parses it looking for the trybot - artifact name (e.g. something like - 'trybot-daisy-release/R40-6394.0.0-b1389'). It returns the - artifact name, if found. - """ - trybot_image = '' - url += '/text' - newurl = url.replace('uberchromegw', 'chromegw') - webpage = urllib2.urlopen(newurl) - data = webpage.read() - lines = data.split('\n') - for l in lines: - if l.find('Artifacts') > 0 and l.find('trybot') > 0: - trybot_name = 'trybot-%s' % build - start_pos = l.find(trybot_name) - end_pos = l.find('@https://storage') - trybot_image = l[start_pos:end_pos] - - return trybot_image - - -def GetBuildData(buildbot_queue, build_id): - """Find the Reports stage web page for a trybot build. - - This takes the name of a buildbot_queue, such as 'daisy-release' - and a build id (the build number), and uses the json buildbot api to - find the Reports stage web page for that build, if it exists. - """ - builder = buildbot_json.Buildbot( - 'http://chromegw/p/tryserver.chromiumos/').builders[buildbot_queue] - build_data = builder.builds[build_id].data - logs = build_data['logs'] - for l in logs: - fname = l[1] - if 'steps/Report/' in fname: - return fname +def RunCommandInPath(path, cmd): + ce = command_executer.GetCommandExecuter() + cwd = os.getcwd() + os.chdir(path) + status, stdout, stderr = ce.RunCommandWOutput(cmd, print_to_console=False) + os.chdir(cwd) + return status, stdout, stderr - return '' +def PeekTrybotImage(chromeos_root, buildbucket_id): + """Get the artifact URL of a given tryjob. -def FindBuildRecordFromLog(description, build_info): - """Find the right build record in the build logs. + Args: + buildbucket_id: buildbucket-id + chromeos_root: root dir of chrome os checkout - Get the first build record from build log with a reason field - that matches 'description'. ('description' is a special tag we - created when we launched the buildbot, so we could find it at this - point.) + Returns: + (status, url) where status can be 'pass', 'fail', 'running', + and url looks like: + gs://chromeos-image-archive/trybot-elm-release-tryjob/R67-10468.0.0-b20789 """ - for build_log in build_info: - property_list = build_log['properties'] - for prop in property_list: - if len(prop) < 2: - continue - pname = prop[0] - pvalue = prop[1] - if pname == 'name' and pvalue == description: - return build_log - return {} - - -def GetBuildInfo(file_dir, waterfall_builder): - """Get all the build records for the trybot builds.""" - - builder = '' - if waterfall_builder.endswith('-release'): - builder = 'release' - elif waterfall_builder.endswith('-gcc-toolchain'): - builder = 'gcc_toolchain' - elif waterfall_builder.endswith('-llvm-toolchain'): - builder = 'llvm_toolchain' - elif waterfall_builder.endswith('-llvm-next-toolchain'): - builder = 'llvm_next_toolchain' - - sa_file = os.path.expanduser( - os.path.join(file_dir, 'cros_utils', - 'chromeos-toolchain-credentials.json')) - scopes = ['https://www.googleapis.com/auth/userinfo.email'] - - credentials = ServiceAccountCredentials.from_json_keyfile_name( - sa_file, scopes=scopes) - url = ( - 'https://luci-milo.appspot.com/prpc/milo.Buildbot/GetBuildbotBuildsJSON') - - # NOTE: If we want to get build logs for the main waterfall builders, the - # 'master' field below should be 'chromeos' instead of 'chromiumos.tryserver'. - # Builder would be 'amd64-gcc-toolchain' or 'arm-llvm-toolchain', etc. - - body = json.dumps({ - 'master': 'chromiumos.tryserver', - 'builder': builder, - 'include_current': True, - 'limit': 100 - }) - access_token = credentials.get_access_token() - headers = { - 'Accept': 'application/json', - 'Content-Type': 'application/json', - 'Authorization': 'Bearer %s' % access_token.access_token - } - r = urllib2.Request(url, body, headers) - u = urllib2.urlopen(r, timeout=60) - u.read(4) - o = json.load(u) - data = [base64.b64decode(item['data']) for item in o['builds']] - result = [] - for d in data: - tmp = json.loads(d) - result.append(tmp) - return result - - -def FindArchiveImage(chromeos_root, build, build_id): - """Returns name of the trybot artifact for board/build_id.""" - ce = command_executer.GetCommandExecuter() - command = ('gsutil ls gs://chromeos-image-archive/trybot-%s/*b%s' - '/chromiumos_test_image.tar.xz' % (build, build_id)) - _, out, _ = ce.ChrootRunCommandWOutput( - chromeos_root, command, print_to_console=False) - # - # If build_id is not unique, there may be multiple archive images - # to choose from; sort them & pick the first (newest). - # - # If there are multiple archive images found, out will look something - # like this: - # - # 'gs://.../R35-5692.0.0-b105/chromiumos_test_image.tar.xz - # gs://.../R46-7339.0.0-b105/chromiumos_test_image.tar.xz' - # - out = out.rstrip('\n') - tmp_list = out.split('\n') - # After stripping the final '\n' and splitting on any other '\n', we get - # something like this: - # tmp_list = [ 'gs://.../R35-5692.0.0-b105/chromiumos_test_image.tar.xz' , - # 'gs://.../R46-7339.0.0-b105/chromiumos_test_image.tar.xz' ] - # - # If we sort this in descending order, we should end up with the most - # recent test image first, so that's what we do here. - # - if len(tmp_list) > 1: - tmp_list = sorted(tmp_list, reverse=True) - out = tmp_list[0] - - trybot_image = '' - trybot_name = 'trybot-%s' % build - if out and out.find(trybot_name) > 0: - start_pos = out.find(trybot_name) - end_pos = out.find('/chromiumos_test_image') - trybot_image = out[start_pos:end_pos] - - return trybot_image + command = ( + 'cros buildresult --report json --buildbucket-id %s' % buildbucket_id) + rc, out, _ = RunCommandInPath(chromeos_root, command) + # Current implementation of cros buildresult returns fail when a job is still + # running. + if rc != 0: + return ('running', None) -def GetTrybotImage(chromeos_root, - buildbot_name, - patch_list, - build_tag, - other_flags=None, - build_toolchain=False, - async=False): - """Launch buildbot and get resulting trybot artifact name. + results = json.loads(out)[buildbucket_id] - This function launches a buildbot with the appropriate flags to - build the test ChromeOS image, with the current ToT mobile compiler. It - checks every 10 minutes to see if the trybot has finished. When the trybot - has finished, it parses the resulting report logs to find the trybot - artifact (if one was created), and returns that artifact name. + return (results['status'], results['artifacts_url'].rstrip('/')) - chromeos_root is the path to the ChromeOS root, needed for finding chromite - and launching the buildbot. - buildbot_name is the name of the buildbot queue, such as lumpy-release or - daisy-paladin. +def ParseTryjobBuildbucketId(msg): + """Find the buildbucket-id in the messages from `cros tryjob`. - patch_list a python list of the patches, if any, for the buildbot to use. + Args: + msg: messages from `cros tryjob` - build_tag is a (unique) string to be used to look up the buildbot results - from among all the build records. + Returns: + buildbucket-id, which will be passed to `cros buildresult` + """ + output_list = ast.literal_eval(msg) + output_dict = output_list[0] + if 'buildbucket_id' in output_dict: + return output_dict['buildbucket_id'] + return None + + +def SubmitTryjob(chromeos_root, + buildbot_name, + patch_list, + tryjob_flags=None, + build_toolchain=False): + """Calls `cros tryjob ...` + + Args: + chromeos_root: the path to the ChromeOS root, needed for finding chromite + and launching the buildbot. + buildbot_name: the name of the buildbot queue, such as lumpy-release or + daisy-paladin. + patch_list: a python list of the patches, if any, for the buildbot to use. + tryjob_flags: See cros tryjob --help for available options. + build_toolchain: builds and uses the latest toolchain, rather than the + prebuilt one in SDK. + + Returns: + buildbucket id """ - ce = command_executer.GetCommandExecuter() - cbuildbot_path = os.path.join(chromeos_root, 'chromite/cbuildbot') - base_dir = os.getcwd() patch_arg = '' if patch_list: for p in patch_list: patch_arg = patch_arg + ' -g ' + repr(p) - toolchain_flags = '' + if not tryjob_flags: + tryjob_flags = [] if build_toolchain: - toolchain_flags += '--latest-toolchain' - os.chdir(cbuildbot_path) - if other_flags: - optional_flags = ' '.join(other_flags) - else: - optional_flags = '' + tryjob_flags.append('--latest-toolchain') + tryjob_flags = ' '.join(tryjob_flags) # Launch buildbot with appropriate flags. build = buildbot_name - description = build_tag - command_prefix = '' - if not patch_arg: - command_prefix = 'yes | ' - command = ('%s ./cbuildbot --remote --nochromesdk %s' - ' --remote-description=%s %s %s %s' % - (command_prefix, optional_flags, description, toolchain_flags, - patch_arg, build)) - _, out, _ = ce.RunCommandWOutput(command) - if 'Tryjob submitted!' not in out: + command = ('cros tryjob --yes --json --nochromesdk %s %s %s' % + (tryjob_flags, patch_arg, build)) + print('CMD: %s' % command) + _, out, _ = RunCommandInPath(chromeos_root, command) + buildbucket_id = ParseTryjobBuildbucketId(out) + print('buildbucket_id: %s' % repr(buildbucket_id)) + if not buildbucket_id: logger.GetLogger().LogFatal('Error occurred while launching trybot job: ' '%s' % command) + return buildbucket_id - os.chdir(base_dir) - - build_id = 0 - build_status = None - # Wait for buildbot to finish running (check every 10 minutes). Wait - # 10 minutes before the first check to give the buildbot time to launch - # (so we don't start looking for build data before it's out there). - time.sleep(SLEEP_TIME) - done = False - pending = True - # pending_time is the time between when we submit the job and when the - # buildbot actually launches the build. running_time is the time between - # when the buildbot job launches and when it finishes. The job is - # considered 'pending' until we can find an entry for it in the buildbot - # logs. - pending_time = SLEEP_TIME - running_time = 0 - long_slept = False - while not done: - done = True - build_info = GetBuildInfo(base_dir, build) - if not build_info: - if pending_time > TIME_OUT: - logger.GetLogger().LogFatal( - 'Unable to get build logs for target %s.' % build) - else: - pending_message = 'Unable to find build log; job may be pending.' - done = False - - if done: - data_dict = FindBuildRecordFromLog(description, build_info) - if not data_dict: - # Trybot job may be pending (not actually launched yet). - if pending_time > TIME_OUT: - logger.GetLogger().LogFatal('Unable to find build record for trybot' - ' %s.' % description) - else: - pending_message = 'Unable to find build record; job may be pending.' - done = False - else: - # Now that we have actually found the entry for the build - # job in the build log, we know the job is actually - # runnning, not pending, so we flip the 'pending' flag. We - # still have to wait for the buildbot job to finish running - # however. - pending = False - build_id = data_dict['number'] - - if async: - # Do not wait for trybot job to finish; return immediately - return build_id, ' ' - - if not long_slept: - # The trybot generally takes more than 2 hours to finish. - # Wait two hours before polling the status. - long_slept = True - time.sleep(INITIAL_SLEEP_TIME) - pending_time += INITIAL_SLEEP_TIME - if True == data_dict['finished']: - build_status = data_dict['results'] - else: - done = False - - if not done: - if pending: - logger.GetLogger().LogOutput(pending_message) - logger.GetLogger().LogOutput('Current pending time: %d minutes.' % - (pending_time / 60)) - pending_time += SLEEP_TIME - else: - logger.GetLogger().LogOutput( - '{0} minutes passed.'.format(running_time / 60)) - logger.GetLogger().LogOutput('Sleeping {0} seconds.'.format(SLEEP_TIME)) - running_time += SLEEP_TIME +def GetTrybotImage(chromeos_root, + buildbot_name, + patch_list, + tryjob_flags=None, + build_toolchain=False, + async=False): + """Launch buildbot and get resulting trybot artifact name. - time.sleep(SLEEP_TIME) - if running_time > TIME_OUT: - done = True + This function launches a buildbot with the appropriate flags to + build the test ChromeOS image, with the current ToT mobile compiler. It + checks every 10 minutes to see if the trybot has finished. When the trybot + has finished, it parses the resulting report logs to find the trybot + artifact (if one was created), and returns that artifact name. - trybot_image = '' + Args: + chromeos_root: the path to the ChromeOS root, needed for finding chromite + and launching the buildbot. + buildbot_name: the name of the buildbot queue, such as lumpy-release or + daisy-paladin. + patch_list: a python list of the patches, if any, for the buildbot to use. + tryjob_flags: See cros tryjob --help for available options. + build_toolchain: builds and uses the latest toolchain, rather than the + prebuilt one in SDK. + async: don't wait for artifacts; just return the buildbucket id + + Returns: + (buildbucket id, partial image url) e.g. + (8952271933586980528, trybot-elm-release-tryjob/R67-10480.0.0-b2373596) + """ + buildbucket_id = SubmitTryjob(chromeos_root, buildbot_name, patch_list, + tryjob_flags, build_toolchain) + if async: + return buildbucket_id, ' ' + + # The trybot generally takes more than 2 hours to finish. + # Wait two hours before polling the status. + time.sleep(INITIAL_SLEEP_TIME) + elapsed = INITIAL_SLEEP_TIME + status = 'running' + image = '' + while True: + status, image = PeekTrybotImage(chromeos_root, buildbucket_id) + if status == 'running': + if elapsed > TIME_OUT: + logger.GetLogger().LogFatal( + 'Unable to get build result for target %s.' % buildbot_name) + else: + wait_msg = 'Unable to find build result; job may be running.' + logger.GetLogger().LogOutput(wait_msg) + logger.GetLogger().LogOutput('{0} minutes elapsed.'.format(elapsed / 60)) + logger.GetLogger().LogOutput('Sleeping {0} seconds.'.format(SLEEP_TIME)) + time.sleep(SLEEP_TIME) + elapsed += SLEEP_TIME + else: + break - if build.endswith('-toolchain'): - # For rotating testers, we don't care about their build_status + if not buildbot_name.endswith('-toolchain') and status == 'fail': + # For rotating testers, we don't care about their status # result, because if any HWTest failed it will be non-zero. - trybot_image = FindArchiveImage(chromeos_root, build, build_id) - else: + # # The nightly performance tests do not run HWTests, so if - # their build_status is non-zero, we do care. In this case + # their status is non-zero, we do care. In this case # non-zero means the image itself probably did not build. - if build_status in OK_STATUS: - trybot_image = FindArchiveImage(chromeos_root, build, build_id) - if not trybot_image: - logger.GetLogger().LogError('Trybot job %s failed with status %d;' - ' no trybot image generated.' % (description, - build_status)) - - logger.GetLogger().LogOutput("trybot_image is '%s'" % trybot_image) - logger.GetLogger().LogOutput('build_status is %d' % build_status) - return build_id, trybot_image + image = '' + if not image: + logger.GetLogger().LogError( + 'Trybot job (buildbucket id: %s) failed with' + 'status %s; no trybot image generated. ' % (buildbucket_id, status)) + else: + # Convert full gs path to what crosperf expects. For example, convert + # gs://chromeos-image-archive/trybot-elm-release-tryjob/R67-10468.0.0-b20789 + # to + # trybot-elm-release-tryjob/R67-10468.0.0-b20789 + image = '/'.join(image.split('/')[-2:]) -def GetGSContent(chromeos_root, path): - """gsutil cat path""" - - ce = command_executer.GetCommandExecuter() - command = ('gsutil cat gs://chromeos-image-archive/%s' % path) - _, out, _ = ce.ChrootRunCommandWOutput( - chromeos_root, command, print_to_console=False) - return out + logger.GetLogger().LogOutput("image is '%s'" % image) + logger.GetLogger().LogOutput('status is %s' % status) + return buildbucket_id, image def DoesImageExist(chromeos_root, build): @@ -386,8 +225,8 @@ def WaitForImage(chromeos_root, build): time.sleep(SLEEP_TIME) elapsed_time += SLEEP_TIME - logger.GetLogger().LogOutput('Image %s not found, waited for %d hours' % - (build, (TIME_OUT / 3600))) + logger.GetLogger().LogOutput( + 'Image %s not found, waited for %d hours' % (build, (TIME_OUT / 3600))) raise BuildbotTimeout('Timeout while waiting for image %s' % build) @@ -405,6 +244,6 @@ def GetLatestImage(chromeos_root, path): candidates = [[int(r) for r in m.group(1, 2, 3, 4)] for m in candidates if m] candidates.sort(reverse=True) for c in candidates: - build = '%s/R%d-%d.%d.%d' % (path, c[0], c[1], c[2], c[3]) - if DoesImageExist(chromeos_root, build): - return build + build = '%s/R%d-%d.%d.%d' % (path, c[0], c[1], c[2], c[3]) + if DoesImageExist(chromeos_root, build): + return build diff --git a/cros_utils/buildbot_utils_unittest.py b/cros_utils/buildbot_utils_unittest.py new file mode 100755 index 00000000..c57b2d32 --- /dev/null +++ b/cros_utils/buildbot_utils_unittest.py @@ -0,0 +1,117 @@ +#!/usr/bin/env python2 + +# Copyright 2018 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. +"""Unittest for buildbot_utils.py.""" + +from __future__ import print_function + +from mock import patch + +import time +import unittest + +from cros_utils import buildbot_utils +from cros_utils import command_executer + + +class TrybotTest(unittest.TestCase): + """Test for CommandExecuter class.""" + + old_tryjob_out = ( + 'Verifying patches...\n' + 'Submitting tryjob...\n' + 'Successfully sent PUT request to [buildbucket_bucket:master.chromiumos.t' + 'ryserver] with [config:success-build] [buildbucket_id:895272114382368817' + '6].\n' + 'Tryjob submitted!\n' + 'To view your tryjobs, visit:\n' + ' http://cros-goldeneye/chromeos/healthmonitoring/buildDetails?buildbuck' + 'etId=8952721143823688176\n' + ' https://uberchromegw.corp.google.com/i/chromiumos.tryserver/waterfall?' + 'committer=laszio@chromium.org&builder=etc\n') + tryjob_out = ( + '[{"buildbucket_id": "8952721143823688176", "build_config": ' + '"cave-llvm-toolchain-tryjob", "url": ' + '"http://cros-goldeneye/chromeos/healthmonitoring/buildDetails?buildbucketId=8952721143823688176"}]' + ) + + buildresult_out = ( + '{"8952721143823688176": {"status": "pass", "artifacts_url":' + '"gs://chromeos-image-archive/trybot-elm-release-tryjob/R67-10468.0.0-' + 'b20789"}}') + + buildbucket_id = '8952721143823688176' + counter_1 = 10 + + def testGetTrybotImage(self): + with patch.object(buildbot_utils, 'SubmitTryjob') as mock_submit: + with patch.object(buildbot_utils, 'PeekTrybotImage') as mock_peek: + with patch.object(time, 'sleep', return_value=None): + + def peek(_chromeos_root, _buildbucket_id): + self.counter_1 -= 1 + if self.counter_1 >= 0: + return ('running', '') + return ('pass', + 'gs://chromeos-image-archive/trybot-elm-release-tryjob/' + 'R67-10468.0.0-b20789') + + mock_peek.side_effect = peek + mock_submit.return_value = self.buildbucket_id + + # sync + buildbucket_id, image = buildbot_utils.GetTrybotImage( + '/tmp', 'falco-release-tryjob', []) + self.assertEqual(buildbucket_id, self.buildbucket_id) + self.assertEqual('trybot-elm-release-tryjob/' + 'R67-10468.0.0-b20789', image) + + # async + buildbucket_id, image = buildbot_utils.GetTrybotImage( + '/tmp', 'falco-release-tryjob', [], async=True) + self.assertEqual(buildbucket_id, self.buildbucket_id) + self.assertEqual(' ', image) + + def testSubmitTryjob(self): + with patch.object(command_executer.CommandExecuter, + 'RunCommandWOutput') as mocked_run: + mocked_run.return_value = (0, self.tryjob_out, '') + buildbucket_id = buildbot_utils.SubmitTryjob('/', 'falco-release-tryjob', + [], []) + self.assertEqual(buildbucket_id, self.buildbucket_id) + + def testPeekTrybotImage(self): + with patch.object(command_executer.CommandExecuter, + 'RunCommandWOutput') as mocked_run: + # pass + mocked_run.return_value = (0, self.buildresult_out, '') + status, image = buildbot_utils.PeekTrybotImage('/', self.buildbucket_id) + self.assertEqual('pass', status) + self.assertEqual( + 'gs://chromeos-image-archive/trybot-elm-release-tryjob/' + 'R67-10468.0.0-b20789', image) + + # running + mocked_run.return_value = (1, '', '') + status, image = buildbot_utils.PeekTrybotImage('/', self.buildbucket_id) + self.assertEqual('running', status) + self.assertEqual(None, image) + + # fail + buildresult_fail = self.buildresult_out.replace('\"pass\"', '\"fail\"') + mocked_run.return_value = (0, buildresult_fail, '') + status, image = buildbot_utils.PeekTrybotImage('/', self.buildbucket_id) + self.assertEqual('fail', status) + self.assertEqual( + 'gs://chromeos-image-archive/trybot-elm-release-tryjob/' + 'R67-10468.0.0-b20789', image) + + def testParseTryjobBuildbucketId(self): + buildbucket_id = buildbot_utils.ParseTryjobBuildbucketId(self.tryjob_out) + self.assertEqual(buildbucket_id, self.buildbucket_id) + + +if __name__ == '__main__': + unittest.main() diff --git a/cros_utils/chromeos-toolchain-credentials.json b/cros_utils/chromeos-toolchain-credentials.json deleted file mode 100644 index aed9a527..00000000 --- a/cros_utils/chromeos-toolchain-credentials.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "service_account", - "project_id": "chromeos-toolchain-u", - "private_key_id": "d0efe593ad39aad4c685273ee80e4c24bb3f2e92", - "private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQC5Rm6aqSjMNrRp\ntYNc++ec79L3QZ2MxLMYKyhlgGhppVt6p/wiSvLdI19nS5TAkKMjKv71rb9DbQlG\nfQVckiY+MlADJKi29lJrwqqNDCcRgB7CL6hgDfmhWMKonZn2MwvBVROD0gi7sY+A\nipIe92jVeqG8Gvp5kOgsBxCRV5YQok8j1FxE5fIsS2sg93VS1YAzH8uPYadWb/Z5\n9uwc8U7SL0mEPjXjsLEm8Y70zovGVjv7kOLqYBMUmROLvSouG/HrZWy9uTgxFOb5\njOhxKhDcDMPVM3g8lfc0EwPUB1NxXztoST9qBJVqdzQmHpPjeDxgru0A+zaQMkWA\ne8Sn5EQrAgMBAAECggEAUnhbe1SY6G3hWLyHQLiQnHbUPWNjselMnxF25deGoqAM\nXEiyHsGl4XGBYgVurVi0hU76NnmkjWrXmhzEajRT+ZODsiJ7RxXWEkmQiUBDk7Kn\n/mAgXsFZwMw1ucCNa93E+cXY7fBsGsAq1FjaOhZ+/6eanpSTsdEix5ZNdaS7E6Op\n9zIba9EjLIvSl435+eWq0C3aU9nd1RbbRwD6vGpgG8L/r957s+AAALTqdSZGWxJX\nEC9OKT07e76qvwAsq2BoBx5vW0xmeQdZgKrA10LLDWa7UjFbwSDJIBESYtd4rYMj\nAqg5eND0bC1RrgzI+RD/10l6Vj8bBFo/403s0P5LYQKBgQDiVGVFkrw5LSy82CGC\nvSraxPriivEweMfpkp6buMbD2Je0RMR4glc1vW5m0QUJmy+ymiIHVMCmE9xNBwbS\nRyCBnrs2+3FtdnruNdcaGh6sbTlY+qJI0rEZUdbb5OhlHZF47KW66hI6sWJ1YF8O\niLQTokW8ejybprCtl1HvEHhEbwKBgQDRkD/acZrvmcnqqmorqW6mgJEkrRF/i5Th\npDo3WegXA4irX0tNqh5w+wms8r41vUZSCZYvyi0Of9LMObVdB/gA/qVzETE0p5he\ns3Skp/VK8nF53pAUd+4dKlnCvD3TOEkIq+kxuEOs2iHJcvSjmKtMgqfMK/UtieB4\n7+MaOcbyBQKBgHOUndMVyEF6rGoUBaj6abQm++hNBDa4t360fYMQrZC+P1qz85GH\nHno3LvYar/Pj6EvRIqeTxH4LjmlXuUgRQqxvHzRI2/gGlWio3hxaUmfDr5GdDNsb\nnY1MmejZ0UQyAWQ7lbcKahzHEXzXpjOJ5ExShkJmOiVSzs8Xg6QOSRzJAoGAemYs\nRWQxQFysqJlcZaASdsGFBMzo+XwHOzt2nTmv6zEvNBj2nKgOG6MkZZVqL20bk3Lx\n+3u0kVFrR8k0+t9apQoWjHywJrb0setS55EKHfo4+RtbP/lEZFiGEM1ttt6bGat/\nCoE7VcwaC9VOufbDpm5xnzjVfQGY0EocdQbmAhkCgYB/isdqeDyafawr+38fcU1r\nX2+cK5JCrEzHIwg2QN3Z56cRrqrb+kK1H3w/F7ZfrlPSmS8XMwZV73QwieoGNIYL\nie9UZqRoZSG73FzIw5mXhWWA1adFz8HpGG5wRNshnPI2liOPwhnblfadJUfXb2br\n021vPgpsxamLjHSDSmSf6Q==\n-----END PRIVATE KEY-----\n", - "client_email": "mobiletc-prebuild-2@chromeos-toolchain-u.iam.gserviceaccount.com", - "client_id": "114495086044042319417", - "auth_uri": "https://accounts.google.com/o/oauth2/auth", - "token_uri": "https://accounts.google.com/o/oauth2/token", - "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs", - "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/mobiletc-prebuild-2%40chromeos-toolchain-u.iam.gserviceaccount.com" -} diff --git a/cros_utils/misc.py b/cros_utils/misc.py index 939ed66b..f9034b89 100644 --- a/cros_utils/misc.py +++ b/cros_utils/misc.py @@ -18,7 +18,8 @@ import command_executer import logger CHROMEOS_SCRIPTS_DIR = '~/trunk/src/scripts' -TOOLCHAIN_UTILS_PATH = '~/trunk/src/platform/dev/toolchain_utils.sh' +TOOLCHAIN_UTILS_PATH = ('/mnt/host/source/src/third_party/toolchain-utils/' + 'cros_utils/toolchain_utils.sh') def GetChromeOSVersionFromLSBVersion(lsb_version): diff --git a/cros_utils/toolchain_utils.sh b/cros_utils/toolchain_utils.sh new file mode 100644 index 00000000..5e9a2a32 --- /dev/null +++ b/cros_utils/toolchain_utils.sh @@ -0,0 +1,32 @@ +#!/bin/bash +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +# TODO: Convert this to python. + +get_all_board_toolchains() +{ + cros_setup_toolchains --show-board-cfg="$1" | sed 's:,: :g' +} + +get_ctarget_from_board() +{ + local all_toolchains=( $(get_all_board_toolchains "$@") ) + echo "${all_toolchains[0]}" +} + +get_board_arch() +{ + local ctarget=$(get_ctarget_from_board "$@") + + # Ask crossdev what the magical portage arch is! + local arch=$(eval $(crossdev --show-target-cfg "${ctarget}"); echo ${arch}) + if [[ -z ${arch} ]] ; then + error "Unable to determine ARCH from toolchain: ${ctarget}" + return 1 + fi + + echo "${arch}" + return 0 +} |