Merge pull request #5172 from stanley-cheung/composer-test

Test fix php interop test composer install git clone problem
pull/5170/merge
Stanley Cheung 9 years ago
commit fff1cb7f61
  1. 6
      tools/run_tests/run_interop_tests.py

@ -535,10 +535,10 @@ def build_interop_image_jobspec(language, tag=None):
env['TTY_FLAG'] = '-t' env['TTY_FLAG'] = '-t'
# This env variable is used to get around the github rate limit # This env variable is used to get around the github rate limit
# error when running the PHP `composer install` command # error when running the PHP `composer install` command
# TODO(stanleycheung): find a more elegant way to do this host_file = '%s/.composer/auth.json' % os.environ['HOME']
if language.safename == 'php' and os.path.exists('/var/local/.composer/auth.json'): if language.safename == 'php' and os.path.exists(host_file):
env['BUILD_INTEROP_DOCKER_EXTRA_ARGS'] = \ env['BUILD_INTEROP_DOCKER_EXTRA_ARGS'] = \
'-v /var/local/.composer/auth.json:/root/.composer/auth.json:ro' '-v %s:/root/.composer/auth.json:ro' % host_file
build_job = jobset.JobSpec( build_job = jobset.JobSpec(
cmdline=['tools/jenkins/build_interop_image.sh'], cmdline=['tools/jenkins/build_interop_image.sh'],
environ=env, environ=env,

Loading…
Cancel
Save