Merge pull request #24085 from HannahShiSFB/del-php5-part3

PHP: replace php/php-dev to php7.2/php7.2-dev and delete php5 tests
pull/24304/head
Stanley Cheung 4 years ago committed by GitHub
commit 2f6fe29341
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 21
      tools/dockerfile/distribtest/php_jessie_x64/Dockerfile
  2. 2
      tools/gce/linux_kokoro_performance_worker_init.sh
  3. 2
      tools/internal_ci/linux/grpc_basictests_php.cfg
  4. 2
      tools/internal_ci/macos/grpc_basictests_php.cfg
  5. 2
      tools/internal_ci/macos/pull_request/grpc_basictests_php.cfg
  6. 41
      tools/run_tests/run_tests.py
  7. 11
      tools/run_tests/run_tests_matrix.py

@ -1,21 +0,0 @@
# Copyright 2015 gRPC authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
FROM debian:jessie
RUN apt-get update && apt-get install -y php5 php5-dev php-pear wget
RUN wget https://phar.phpunit.de/phpunit-5.7.27.phar && \
mv phpunit-5.7.27.phar /usr/local/bin/phpunit && \
chmod +x /usr/local/bin/phpunit

@ -161,7 +161,7 @@ ruby -v
gem install bundler gem install bundler
# PHP dependencies # PHP dependencies
sudo apt-get install -y php php-dev php-pear unzip zlib1g-dev sudo apt-get install -y php7.2 php7.2-dev php-pear unzip zlib1g-dev
sudo wget https://phar.phpunit.de/phpunit-5.7.27.phar && \ sudo wget https://phar.phpunit.de/phpunit-5.7.27.phar && \
sudo mv phpunit-5.7.27.phar /usr/local/bin/phpunit && \ sudo mv phpunit-5.7.27.phar /usr/local/bin/phpunit && \
sudo chmod +x /usr/local/bin/phpunit sudo chmod +x /usr/local/bin/phpunit

@ -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 --bq_result_table aggregate_results" value: "-f basictests linux php7 --inner_jobs 16 -j 2 --internal_ci --bq_result_table aggregate_results"
} }

@ -27,5 +27,5 @@ action {
env_vars { env_vars {
key: "RUN_TESTS_FLAGS" key: "RUN_TESTS_FLAGS"
value: "-f basictests macos php --internal_ci -j 1 --inner_jobs 4 --bq_result_table aggregate_results" value: "-f basictests macos php7 --internal_ci -j 1 --inner_jobs 4 --bq_result_table aggregate_results"
} }

@ -27,5 +27,5 @@ action {
env_vars { env_vars {
key: "RUN_TESTS_FLAGS" key: "RUN_TESTS_FLAGS"
value: "-f basictests macos php --internal_ci -j 1 --inner_jobs 4 --max_time=3600" value: "-f basictests macos php7 --internal_ci -j 1 --inner_jobs 4 --max_time=3600"
} }

@ -571,46 +571,6 @@ class RemoteNodeLanguage(object):
return 'grpc-node' return 'grpc-node'
class PhpLanguage(object):
def configure(self, config, args):
self.config = config
self.args = args
_check_compiler(self.args.compiler, ['default'])
self._make_options = ['EMBED_OPENSSL=true', 'EMBED_ZLIB=true']
def test_specs(self):
return [
self.config.job_spec(['src/php/bin/run_tests.sh'],
environ=_FORCE_ENVIRON_FOR_WRAPPERS)
]
def pre_build_steps(self):
return []
def make_targets(self):
return ['static_c', 'shared_c']
def make_options(self):
return self._make_options
def build_steps(self):
return [['tools/run_tests/helper_scripts/build_php.sh']]
def post_tests_steps(self):
return [['tools/run_tests/helper_scripts/post_tests_php.sh']]
def makefile_name(self):
return 'Makefile'
def dockerfile_dir(self):
return 'tools/dockerfile/test/php_jessie_%s' % _docker_arch_suffix(
self.args.arch)
def __str__(self):
return 'php'
class Php7Language(object): class Php7Language(object):
def configure(self, config, args): def configure(self, config, args):
@ -1288,7 +1248,6 @@ _LANGUAGES = {
'c++': CLanguage('cxx', 'c++'), 'c++': CLanguage('cxx', 'c++'),
'c': CLanguage('c', 'c'), 'c': CLanguage('c', 'c'),
'grpc-node': RemoteNodeLanguage(), 'grpc-node': RemoteNodeLanguage(),
'php': PhpLanguage(),
'php7': Php7Language(), 'php7': Php7Language(),
'python': PythonLanguage(), 'python': PythonLanguage(),
'ruby': RubyLanguage(), 'ruby': RubyLanguage(),

@ -180,15 +180,6 @@ def _create_test_jobs(extra_args=[], inner_jobs=_DEFAULT_INNER_JOBS):
['--report_multi_target'], ['--report_multi_target'],
inner_jobs=inner_jobs) inner_jobs=inner_jobs)
# supported on linux only
test_jobs += _generate_jobs(languages=['php7'],
configs=['dbg', 'opt'],
platforms=['linux'],
labels=['basictests', 'multilang'],
extra_args=extra_args +
['--report_multi_target'],
inner_jobs=inner_jobs)
# supported on all platforms. # supported on all platforms.
test_jobs += _generate_jobs( test_jobs += _generate_jobs(
languages=['c'], languages=['c'],
@ -239,7 +230,7 @@ def _create_test_jobs(extra_args=[], inner_jobs=_DEFAULT_INNER_JOBS):
inner_jobs=inner_jobs, inner_jobs=inner_jobs,
timeout_seconds=_CPP_RUNTESTS_TIMEOUT) timeout_seconds=_CPP_RUNTESTS_TIMEOUT)
test_jobs += _generate_jobs(languages=['grpc-node', 'ruby', 'php'], test_jobs += _generate_jobs(languages=['grpc-node', 'ruby', 'php7'],
configs=['dbg', 'opt'], configs=['dbg', 'opt'],
platforms=['linux', 'macos'], platforms=['linux', 'macos'],
labels=['basictests', 'multilang'], labels=['basictests', 'multilang'],

Loading…
Cancel
Save