Skip to content

Commit

Permalink
del php5 from basic Linux test and interop test
Browse files Browse the repository at this point in the history
  • Loading branch information
HannahShiSFB committed Sep 30, 2020
1 parent 840e679 commit 867f579
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 39 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@ action {

env_vars {
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"
}
2 changes: 1 addition & 1 deletion tools/interop_matrix/client_matrix.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ def should_build_docker_interop_image_from_release_tag(lang):
'python': ['python', 'pythonasyncio'],
'node': ['node'],
'ruby': ['ruby'],
'php': ['php', 'php7'],
'php': ['php7'],
'csharp': ['csharp', 'csharpcoreclr'],
}

Expand Down
38 changes: 1 addition & 37 deletions tools/run_tests/run_interop_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -483,35 +483,6 @@ def __str__(self):
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:

def __init__(self):
Expand Down Expand Up @@ -734,7 +705,6 @@ def __str__(self):
'javaokhttp': JavaOkHttpClient(),
'node': NodeLanguage(),
'nodepurejs': NodePureJSLanguage(),
'php': PHPLanguage(),
'php7': PHP7Language(),
'objc': ObjcLanguage(),
'ruby': RubyLanguage(),
Expand Down Expand Up @@ -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 language in [
'csharp', 'csharpcoreclr', 'aspnetcore', 'node', 'php', 'php7',
'csharp', 'csharpcoreclr', 'aspnetcore', 'node', 'php7',
'python', 'ruby', 'nodepurejs'
]:
env['GOOGLE_APPLICATION_CREDENTIALS'] = service_account_key_file
Expand Down Expand Up @@ -1161,12 +1131,6 @@ def build_interop_image_jobspec(language, tag=None):
}
if not args.travis:
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(
cmdline=['tools/run_tests/dockerize/build_interop_image.sh'],
environ=env,
Expand Down

0 comments on commit 867f579

Please sign in to comment.