del php5 from basic Linux test and interop test

pull/23922/head
root 4 years ago
parent 840e67984a
commit 867f579e54
  1. 2
      tools/internal_ci/linux/pull_request/grpc_basictests_php.cfg
  2. 2
      tools/interop_matrix/client_matrix.py
  3. 38
      tools/run_tests/run_interop_tests.py

@ -26,5 +26,5 @@ action {
env_vars { env_vars {
key: "RUN_TESTS_FLAGS" key: "RUN_TESTS_FLAGS"
value: "-f basictests linux php --inner_jobs 16 -j 2 --internal_ci --max_time=3600" value: "-f basictests linux php7 --inner_jobs 16 -j 2 --internal_ci --max_time=3600"
} }

@ -59,7 +59,7 @@ LANG_RUNTIME_MATRIX = {
'python': ['python', 'pythonasyncio'], 'python': ['python', 'pythonasyncio'],
'node': ['node'], 'node': ['node'],
'ruby': ['ruby'], 'ruby': ['ruby'],
'php': ['php', 'php7'], 'php': ['php7'],
'csharp': ['csharp', 'csharpcoreclr'], 'csharp': ['csharp', 'csharpcoreclr'],
} }

@ -483,35 +483,6 @@ class NodePureJSLanguage:
return 'nodepurejs' return 'nodepurejs'
class PHPLanguage:
def __init__(self):
self.client_cwd = None
self.safename = str(self)
def client_cmd(self, args):
return ['src/php/bin/interop_client.sh'] + args
def cloud_to_prod_env(self):
return {}
def global_env(self):
return {}
def unimplemented_test_cases(self):
return _SKIP_SERVER_COMPRESSION + \
_SKIP_DATA_FRAME_PADDING + \
_SKIP_SPECIAL_STATUS_MESSAGE + \
_SKIP_GOOGLE_DEFAULT_CREDS + \
_SKIP_COMPUTE_ENGINE_CHANNEL_CREDS
def unimplemented_test_cases_server(self):
return []
def __str__(self):
return 'php'
class PHP7Language: class PHP7Language:
def __init__(self): def __init__(self):
@ -734,7 +705,6 @@ _LANGUAGES = {
'javaokhttp': JavaOkHttpClient(), 'javaokhttp': JavaOkHttpClient(),
'node': NodeLanguage(), 'node': NodeLanguage(),
'nodepurejs': NodePureJSLanguage(), 'nodepurejs': NodePureJSLanguage(),
'php': PHPLanguage(),
'php7': PHP7Language(), 'php7': PHP7Language(),
'objc': ObjcLanguage(), 'objc': ObjcLanguage(),
'ruby': RubyLanguage(), 'ruby': RubyLanguage(),
@ -879,7 +849,7 @@ def auth_options(language, test_case, google_default_creds_use_key_file,
if test_case in ['jwt_token_creds', 'per_rpc_creds', 'oauth2_auth_token']: if test_case in ['jwt_token_creds', 'per_rpc_creds', 'oauth2_auth_token']:
if language in [ if language in [
'csharp', 'csharpcoreclr', 'aspnetcore', 'node', 'php', 'php7', 'csharp', 'csharpcoreclr', 'aspnetcore', 'node', 'php7',
'python', 'ruby', 'nodepurejs' 'python', 'ruby', 'nodepurejs'
]: ]:
env['GOOGLE_APPLICATION_CREDENTIALS'] = service_account_key_file env['GOOGLE_APPLICATION_CREDENTIALS'] = service_account_key_file
@ -1161,12 +1131,6 @@ def build_interop_image_jobspec(language, tag=None):
} }
if not args.travis: if not args.travis:
env['TTY_FLAG'] = '-t' env['TTY_FLAG'] = '-t'
# This env variable is used to get around the github rate limit
# error when running the PHP `composer install` command
host_file = '%s/.composer/auth.json' % os.environ['HOME']
if language.safename == 'php' and os.path.exists(host_file):
env['BUILD_INTEROP_DOCKER_EXTRA_ARGS'] = \
'-v %s:/root/.composer/auth.json:ro' % host_file
build_job = jobset.JobSpec( build_job = jobset.JobSpec(
cmdline=['tools/run_tests/dockerize/build_interop_image.sh'], cmdline=['tools/run_tests/dockerize/build_interop_image.sh'],
environ=env, environ=env,

Loading…
Cancel
Save