From 223c6cd03743d8fcbddc5a11c408f4206eded654 Mon Sep 17 00:00:00 2001 From: Ayush Ranjan Date: Mon, 20 May 2024 12:06:21 -0700 Subject: [PATCH] Bump PHP runtime tests to PHP 8.3.7. Also reduce the parallelism on BuildKite for this test. On a e2-standard-8 machine, these tests only take 9 minutes. It should suffice to run on just 2 agents. PiperOrigin-RevId: 635530447 --- .buildkite/pipeline.yaml | 8 +-- .../{php8.1.1 => php8.3.7}/Dockerfile.x86_64 | 5 +- test/runtimes/BUILD | 4 +- test/runtimes/README.md | 2 +- test/runtimes/exclude/php8.1.1.csv | 58 ------------------- test/runtimes/exclude/php8.3.7.csv | 6 ++ 6 files changed, 16 insertions(+), 67 deletions(-) rename images/runtimes/{php8.1.1 => php8.3.7}/Dockerfile.x86_64 (87%) delete mode 100644 test/runtimes/exclude/php8.1.1.csv create mode 100644 test/runtimes/exclude/php8.3.7.csv diff --git a/.buildkite/pipeline.yaml b/.buildkite/pipeline.yaml index 6e9bf5e3d..9f1849d8a 100644 --- a/.buildkite/pipeline.yaml +++ b/.buildkite/pipeline.yaml @@ -502,8 +502,8 @@ steps: - <<: *common <<: *docker label: ":php: PHP runtime tests" - command: make php8.1.1-runtime-tests RUNTIME_ARGS=--directfs - parallelism: 10 + command: make php8.3.7-runtime-tests RUNTIME_ARGS=--directfs + parallelism: 2 agents: <<: *platform_specific_agents arch: "amd64" @@ -544,8 +544,8 @@ steps: - <<: *common <<: *docker label: ":php: PHP runtime tests (goferfs)" - command: make php8.1.1-runtime-tests RUNTIME_ARGS=--directfs=false - parallelism: 10 + command: make php8.3.7-runtime-tests RUNTIME_ARGS=--directfs=false + parallelism: 2 if: build.branch == "master" agents: <<: *platform_specific_agents diff --git a/images/runtimes/php8.1.1/Dockerfile.x86_64 b/images/runtimes/php8.3.7/Dockerfile.x86_64 similarity index 87% rename from images/runtimes/php8.1.1/Dockerfile.x86_64 rename to images/runtimes/php8.3.7/Dockerfile.x86_64 index d85db7c92..1cde7d756 100644 --- a/images/runtimes/php8.1.1/Dockerfile.x86_64 +++ b/images/runtimes/php8.3.7/Dockerfile.x86_64 @@ -1,4 +1,4 @@ -FROM ubuntu:bionic +FROM ubuntu:jammy RUN apt-get update && apt-get install -y \ autoconf \ automake \ @@ -8,10 +8,11 @@ RUN apt-get update && apt-get install -y \ libsqlite3-dev \ libtool \ libxml2-dev \ + pkg-config \ re2c WORKDIR /root -ARG VERSION=8.1.1 +ARG VERSION=8.3.7 RUN curl -o php-${VERSION}.tar.gz https://www.php.net/distributions/php-${VERSION}.tar.gz RUN tar -zxf php-${VERSION}.tar.gz diff --git a/test/runtimes/BUILD b/test/runtimes/BUILD index ba807d35e..fbdaab534 100644 --- a/test/runtimes/BUILD +++ b/test/runtimes/BUILD @@ -29,8 +29,8 @@ runtime_test( ) runtime_test( - name = "php8.1.1", - exclude_file = "exclude/php8.1.1.csv", + name = "php8.3.7", + exclude_file = "exclude/php8.3.7.csv", lang = "php", shard_count = more_shards, ) diff --git a/test/runtimes/README.md b/test/runtimes/README.md index fa0ce17d9..ccef8a078 100644 --- a/test/runtimes/README.md +++ b/test/runtimes/README.md @@ -31,7 +31,7 @@ Language | Version | Running the test suite Go | 1.22 | `make go1.22-runtime-tests` Java | 21 | `make java21-runtime-tests` NodeJS | 16.13.2 | `make nodejs16.13.2-runtime-tests` -Php | 8.1.1 | `make php8.1.1-runtime-tests` +Php | 8.3.7 | `make php8.3.7-runtime-tests` Python | 3.10.2 | `make python3.10.2-runtime-tests` You can modify the runtime test behaviors by passing in the following `make` diff --git a/test/runtimes/exclude/php8.1.1.csv b/test/runtimes/exclude/php8.1.1.csv deleted file mode 100644 index d49c57cea..000000000 --- a/test/runtimes/exclude/php8.1.1.csv +++ /dev/null @@ -1,58 +0,0 @@ -test name,bug id,comment -Zend/tests/concat_003.phpt,b/162896021, -ext/opcache/tests/bug78014.phpt,,Broken test -ext/opcache/tests/bug78175.phpt,,Broken test -ext/opcache/tests/bug78175_2.phpt,,Broken test -ext/opcache/tests/bug78376.phpt,,Broken test -ext/opcache/tests/bug78937_1.phpt,,Broken test -ext/opcache/tests/bug78937_2.phpt,,Broken test -ext/opcache/tests/bug78937_3.phpt,,Broken test -ext/opcache/tests/bug78937_4.phpt,,Broken test -ext/opcache/tests/bug78937_5.phpt,,Broken test -ext/opcache/tests/bug78937_6.phpt,,Broken test -ext/opcache/tests/jit/bug80634.phpt,,Broken test -ext/opcache/tests/jit/bug81256.phpt,,Broken test -ext/opcache/tests/preload_001.phpt,,Broken test -ext/opcache/tests/preload_002.phpt,,Broken test -ext/opcache/tests/preload_003.phpt,,Broken test -ext/opcache/tests/preload_004.phpt,,Broken test -ext/opcache/tests/preload_005.phpt,,Broken test -ext/opcache/tests/preload_006.phpt,,Broken test -ext/opcache/tests/preload_007.phpt,,Broken test -ext/opcache/tests/preload_008.phpt,,Broken test -ext/opcache/tests/preload_009.phpt,,Broken test -ext/opcache/tests/preload_010.phpt,,Broken test -ext/opcache/tests/preload_011.phpt,,Broken test -ext/opcache/tests/preload_012.phpt,,Broken test -ext/opcache/tests/preload_013.phpt,,Broken test -ext/opcache/tests/preload_bug79114.phpt,,Broken test -ext/opcache/tests/preload_class_alias.phpt,,Broken test -ext/opcache/tests/preload_class_alias_2.phpt,,Broken test -ext/opcache/tests/preload_dynamic_def_removal.phpt,,Broken test -ext/opcache/tests/preload_dynamic_function.phpt,,Broken test -ext/opcache/tests/preload_early_binding.phpt,,Broken test -ext/opcache/tests/preload_enum.phpt,,Broken test -ext/opcache/tests/preload_error_handler.phpt,,Broken test -ext/opcache/tests/preload_ind.phpt,,Broken test -ext/opcache/tests/preload_loadable_classes_1.phpt,,Broken test -ext/opcache/tests/preload_loadable_classes_2.phpt,,Broken test -ext/opcache/tests/preload_loadable_classes_3.phpt,,Broken test -ext/opcache/tests/preload_method_static_vars.phpt,,Broken test -ext/opcache/tests/preload_parse_error.phpt,,Broken test -ext/opcache/tests/preload_prop_info_table.phpt,,Broken test -ext/opcache/tests/preload_static_var_inheritance.phpt,,Broken test -ext/opcache/tests/preload_trait_alias.phpt,,Broken test -ext/opcache/tests/preload_trait_multiple_fixup.phpt,,Broken test -ext/opcache/tests/preload_trait_static.phpt,,Broken test -ext/opcache/tests/preload_unresolved_prop_type.phpt,,Broken test -ext/openssl/tests/openssl_dh_compute_key.phpt,,Broken test -ext/standard/tests/file/bug69442.phpt,, -ext/standard/tests/file/bug60120.phpt,b/241944760,Flakily times out -ext/standard/tests/file/fopen_variation19.phpt,b/162894964, -ext/standard/tests/file/symlink_link_linkinfo_is_link_variation4.phpt,b/162895341, -sapi/cli/tests/upload_2G.phpt,, -tests/output/stream_isatty_err.phpt,b/68720279, -tests/output/stream_isatty_in-err.phpt,b/68720282, -tests/output/stream_isatty_in-out.phpt,b/68720299, -tests/output/stream_isatty_out-err.phpt,b/68720311, -tests/output/stream_isatty_out.phpt,b/68720325, diff --git a/test/runtimes/exclude/php8.3.7.csv b/test/runtimes/exclude/php8.3.7.csv new file mode 100644 index 000000000..f3ff8c539 --- /dev/null +++ b/test/runtimes/exclude/php8.3.7.csv @@ -0,0 +1,6 @@ +test name,bug id,comment +tests/output/stream_isatty_err.phpt,,Fails on Buildkite because container needs to be run with a pseudo-TTY +tests/output/stream_isatty_in-err.phpt,,Fails on Buildkite because container needs to be run with a pseudo-TTY +tests/output/stream_isatty_in-out.phpt,,Fails on Buildkite because container needs to be run with a pseudo-TTY +tests/output/stream_isatty_out-err.phpt,,Fails on Buildkite because container needs to be run with a pseudo-TTY +tests/output/stream_isatty_out.phpt,,Fails on Buildkite because container needs to be run with a pseudo-TTY