| OLD | NEW |
| 1 """ This file contains configuration information for the build slave host | 1 """ This file contains configuration information for the build slave host |
| 2 machines. """ | 2 machines. """ |
| 3 | 3 |
| 4 | 4 |
| 5 import collections | 5 import collections |
| 6 import ntpath | 6 import ntpath |
| 7 import os | 7 import os |
| 8 import posixpath | 8 import posixpath |
| 9 | 9 |
| 10 import skia_vars | 10 import skia_vars |
| (...skipping 26 matching lines...) Expand all Loading... |
| 37 GCE_USERNAME = skia_vars.GetGlobalVariable('gce_username') | 37 GCE_USERNAME = skia_vars.GetGlobalVariable('gce_username') |
| 38 | 38 |
| 39 SKIALAB_ROUTER_IP = skia_vars.GetGlobalVariable('skialab_router_ip') | 39 SKIALAB_ROUTER_IP = skia_vars.GetGlobalVariable('skialab_router_ip') |
| 40 SKIALAB_USERNAME = skia_vars.GetGlobalVariable('skialab_username') | 40 SKIALAB_USERNAME = skia_vars.GetGlobalVariable('skialab_username') |
| 41 | 41 |
| 42 | 42 |
| 43 # Procedures for logging in to the host machines. | 43 # Procedures for logging in to the host machines. |
| 44 | 44 |
| 45 def skia_lab_login(hostname, config): | 45 def skia_lab_login(hostname, config): |
| 46 """Procedure for logging into SkiaLab machines.""" | 46 """Procedure for logging into SkiaLab machines.""" |
| 47 # The multiple "-t"s are needed in order to force tty allocation, which gives | |
| 48 # us the expected interactive behavior, even with two levels of SSH. | |
| 49 return [ | 47 return [ |
| 50 'ssh', '-t', '-t', '%s@%s' % (SKIALAB_USERNAME, SKIALAB_ROUTER_IP), | 48 'ssh', '%s@%s' % (SKIALAB_USERNAME, SKIALAB_ROUTER_IP), |
| 51 'ssh', '%s@%s' % (SKIALAB_USERNAME, config['ip']) | 49 'ssh', '%s@%s' % (SKIALAB_USERNAME, config['ip']) |
| 52 ] | 50 ] |
| 53 | 51 |
| 54 | 52 |
| 55 def compute_engine_login(hostname, config): | 53 def compute_engine_login(hostname, config): |
| 56 """Procedure for logging into Skia GCE instances.""" | 54 """Procedure for logging into Skia GCE instances.""" |
| 57 return [ | 55 return [ |
| 58 'gcutil', '--project=%s' % GCE_PROJECT, | 56 'gcutil', '--project=%s' % GCE_PROJECT, |
| 59 'ssh', '--ssh_user=%s' % GCE_USERNAME, hostname, | 57 'ssh', '--ssh_user=%s' % GCE_USERNAME, hostname, |
| 60 ] | 58 ] |
| (...skipping 537 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 598 """Helper function for retrieving slave host configuration information. | 596 """Helper function for retrieving slave host configuration information. |
| 599 | 597 |
| 600 If the given hostname is unknown, returns a default config. | 598 If the given hostname is unknown, returns a default config. |
| 601 | 599 |
| 602 Args: | 600 Args: |
| 603 hostname: string; the hostname of the slave host machine. | 601 hostname: string; the hostname of the slave host machine. |
| 604 Returns: | 602 Returns: |
| 605 SlaveHostConfig instance representing the given host. | 603 SlaveHostConfig instance representing the given host. |
| 606 """ | 604 """ |
| 607 return SLAVE_HOSTS.get(hostname, default_slave_host_config(hostname)) | 605 return SLAVE_HOSTS.get(hostname, default_slave_host_config(hostname)) |
| OLD | NEW |