Fix php build and upgrade to php8

Makefile

@@ -2,7 +2,7 @@
 TEST_INFRA_VERSION ?= latest
 
 # Version of gRPC core used for the gRPC driver
-DRIVER_VERSION ?= v1.68.0
+DRIVER_VERSION ?= v1.82.1
 
 # Prefix for all images used as clone and ready containers, enabling use with
 # registries other than Docker Hub
@@ -100,7 +100,7 @@ delete_prebuilt_workers: fmt vet ## Build the delete_prebuilt_workers tool binar
 
 ##@ Build container images
 
-all-images: clone-image controller-image csharp-build-image cxx-image dotnet-build-image dotnet-image driver-image java-image node-build-image node-image php7-build-image php7-image python-image ready-image ruby-build-image ruby-image rust-build-image ## Build all container images.
+all-images: clone-image controller-image csharp-build-image cxx-image dotnet-build-image dotnet-image driver-image java-image node-build-image node-image php8-build-image php8-image python-image ready-image ruby-build-image ruby-image rust-build-image ## Build all container images.
 
 clone-image: ## Build the clone init container image.
 	docker build -t $(INIT_IMAGE_PREFIX)clone:$(TEST_INFRA_VERSION) containers/init/clone
@@ -132,11 +132,11 @@ node-build-image: ## Build the Node.js build image
 node-image: ## Build the Node.js test runtime container image.
 	docker build -t $(RUN_IMAGE_PREFIX)node:$(TEST_INFRA_VERSION) containers/runtime/node
 
-php7-build-image: ## Build the PHP7 build-time container image.
-	docker build -t $(BUILD_IMAGE_PREFIX)php7:$(TEST_INFRA_VERSION) containers/init/build/php7
+php8-build-image: ## Build the PHP8 build-time container image.
+	docker build -t $(BUILD_IMAGE_PREFIX)php8:$(TEST_INFRA_VERSION) containers/init/build/php8
 
-php7-image: ## Build the PHP7 test runtime container image.
-	docker build -t $(RUN_IMAGE_PREFIX)php7:$(TEST_INFRA_VERSION) containers/runtime/php7
+php8-image: ## Build the PHP8 test runtime container image.
+	docker build -t $(RUN_IMAGE_PREFIX)php8:$(TEST_INFRA_VERSION) containers/runtime/php8
 
 python-image: ## Build the Python test runtime container image.
 	docker build -t $(RUN_IMAGE_PREFIX)python:$(TEST_INFRA_VERSION) containers/runtime/python
@@ -155,7 +155,7 @@ rust-build-image: ## Build the Rust build-time container image.
 
 ##@ Publish container images
 
-push-all-images: push-clone-image push-controller-image push-csharp-build-image push-cxx-image push-dotnet-build-image push-dotnet-image push-driver-image push-java-image push-node-build-image push-node-image push-php7-build-image push-php7-image push-python-image push-ready-image push-ruby-build-image push-ruby-image push-rust-build-image ## Push all container images to a registry.
+push-all-images: push-clone-image push-controller-image push-csharp-build-image push-cxx-image push-dotnet-build-image push-dotnet-image push-driver-image push-java-image push-node-build-image push-node-image push-php8-build-image push-php8-image push-python-image push-ready-image push-ruby-build-image push-ruby-image push-rust-build-image ## Push all container images to a registry.
 
 push-clone-image: ## Push the clone init container image to a registry.
 	docker push $(INIT_IMAGE_PREFIX)clone:$(TEST_INFRA_VERSION)
@@ -187,11 +187,11 @@ push-node-build-image: ## Push the Node.js build image to a docker registry
 push-node-image: ## Push the Node.js test runtime container image to a registry.
 	docker push $(RUN_IMAGE_PREFIX)node:$(TEST_INFRA_VERSION)
 
-push-php7-build-image: ## Push the PHP7 build-time container image to a registry.
-	docker push $(BUILD_IMAGE_PREFIX)php7:$(TEST_INFRA_VERSION)
+push-php8-build-image: ## Push the PHP8 build-time container image to a registry.
+	docker push $(BUILD_IMAGE_PREFIX)php8:$(TEST_INFRA_VERSION)
 
-push-php7-image: ## Push the PHP7 test runtime container image to a registry.
-	docker push $(RUN_IMAGE_PREFIX)php7:$(TEST_INFRA_VERSION)
+push-php8-image: ## Push the PHP8 test runtime container image to a registry.
+	docker push $(RUN_IMAGE_PREFIX)php8:$(TEST_INFRA_VERSION)
 
 push-python-image: ## Push the Python test runtime container image to a registry.
 	docker push $(RUN_IMAGE_PREFIX)python:$(TEST_INFRA_VERSION)

config/defaults_template.yaml

@@ -38,13 +38,13 @@ languages:
   buildImage: "{{ .BuildImagePrefix }}node:{{ .Version }}"
   runImage: "{{ .RunImagePrefix }}node:{{ .Version }}"
 
-- language: php7
-  buildImage: "{{ .BuildImagePrefix }}php7:{{ .Version }}"
-  runImage: "{{ .RunImagePrefix }}php7:{{ .Version }}"
+- language: php8
+  buildImage: "{{ .BuildImagePrefix }}php8:{{ .Version }}"
+  runImage: "{{ .RunImagePrefix }}php8:{{ .Version }}"
 
-- language: php7_protobuf_c
-  buildImage: "{{ .BuildImagePrefix }}php7:{{ .Version }}"
-  runImage: "{{ .RunImagePrefix }}php7:{{ .Version }}"
+- language: php8_protobuf_c
+  buildImage: "{{ .BuildImagePrefix }}php8:{{ .Version }}"
+  runImage: "{{ .RunImagePrefix }}php8:{{ .Version }}"
 
 - language: python
   buildImage: us-docker.pkg.dev/grpc-testing/testing-images-public/bazel:ac0cf07a320bb1f337986fd312a1785614cc1e4e@sha256:4b64295380d6c951f3761273344e256f44daab35dd7182ff431a1802695368da

config/samples/php7_example_loadtest.yaml → config/samples/php8_example_loadtest.yaml

@@ -5,12 +5,12 @@ apiVersion: e2etest.grpc.io/v1
 kind: LoadTest
 metadata:
   annotations:
-    scenario: php7_protobuf_php_extension_to_cpp_protobuf_sync_unary_ping_pong
+    scenario: php8_protobuf_php_extension_to_cpp_protobuf_sync_unary_ping_pong
     uniquifier: basic
   labels:
-    language: php7
+    language: php8
     prefix: examples
-  name: examples-php7-protobuf-php-extension-to-cpp-protobuf-sync-unary-ping-pong-basic
+  name: examples-php8-protobuf-php-extension-to-cpp-protobuf-sync-unary-ping-pong-basic
 spec:
   clients:
   - build:
@@ -20,7 +20,7 @@ spec:
     clone:
       gitRef: master
       repo: https://github.com/grpc/grpc.git
-    language: php7
+    language: php8
     name: '0'
     run:
     - args:
@@ -38,7 +38,7 @@ spec:
   scenariosJSON: |
     {
       "scenarios": {
-        "name": "php7_protobuf_php_extension_to_cpp_protobuf_sync_unary_ping_pong",
+        "name": "php8_protobuf_php_extension_to_cpp_protobuf_sync_unary_ping_pong",
         "num_servers": 1,
         "num_clients": 1,
         "client_config": {

config/samples/php7_protobuf_c_example_loadtest.yaml → config/samples/php8_protobuf_c_example_loadtest.yaml

@@ -5,12 +5,12 @@ apiVersion: e2etest.grpc.io/v1
 kind: LoadTest
 metadata:
   annotations:
-    scenario: php7_protobuf_c_extension_to_cpp_protobuf_sync_unary_ping_pong
+    scenario: php8_protobuf_c_extension_to_cpp_protobuf_sync_unary_ping_pong
     uniquifier: basic
   labels:
-    language: php7_protobuf_c
+    language: php8_protobuf_c
     prefix: examples
-  name: examples-php7-protobuf-c-extension-to-cpp-protobuf-sync-unary-ping-pong-basic
+  name: examples-php8-protobuf-c-extension-to-cpp-protobuf-sync-unary-ping-pong-basic
 spec:
   clients:
   - build:
@@ -20,7 +20,7 @@ spec:
     clone:
       gitRef: master
       repo: https://github.com/grpc/grpc.git
-    language: php7_protobuf_c
+    language: php8_protobuf_c
     name: '0'
     run:
     - args:
@@ -38,7 +38,7 @@ spec:
   scenariosJSON: |
     {
       "scenarios": {
-        "name": "php7_protobuf_c_extension_to_cpp_protobuf_sync_unary_ping_pong",
+        "name": "php8_protobuf_c_extension_to_cpp_protobuf_sync_unary_ping_pong",
         "num_servers": 1,
         "num_clients": 1,
         "client_config": {

config/samples/templates/php7_example_loadtest_with_prebuilt_workers.yaml → config/samples/templates/php8_example_loadtest_with_prebuilt_workers.yaml

@@ -6,15 +6,15 @@ kind: LoadTest
 metadata:
   annotations:
     pool: ${workers_pool}
-    scenario: php7_protobuf_php_extension_to_cpp_protobuf_sync_unary_ping_pong
+    scenario: php8_protobuf_php_extension_to_cpp_protobuf_sync_unary_ping_pong
     uniquifier: prebuilt
   labels:
-    language: php7
+    language: php8
     prefix: examples
-  name: examples-php7-protobuf-php-extension-to-cpp-protobuf-sync-unary-ping-pong-prebuilt
+  name: examples-php8-protobuf-php-extension-to-cpp-protobuf-sync-unary-ping-pong-prebuilt
 spec:
   clients:
-  - language: php7
+  - language: php8
     name: '0'
     pool: ${workers_pool}
     run:
@@ -25,7 +25,7 @@ spec:
         /run_scripts/run_worker.sh
       command:
       - bash
-      image: ${prebuilt_image_prefix}/php7:${prebuilt_image_tag}
+      image: ${prebuilt_image_prefix}/php8:${prebuilt_image_tag}
       name: main
   driver:
     language: cxx
@@ -39,7 +39,7 @@ spec:
   scenariosJSON: |
     {
       "scenarios": {
-        "name": "php7_protobuf_php_extension_to_cpp_protobuf_sync_unary_ping_pong",
+        "name": "php8_protobuf_php_extension_to_cpp_protobuf_sync_unary_ping_pong",
         "num_servers": 1,
         "num_clients": 1,
         "client_config": {

config/samples/templates/php7_protobuf_c_example_loadtest_with_prebuilt_workers.yaml → config/samples/templates/php8_protobuf_c_example_loadtest_with_prebuilt_workers.yaml

@@ -6,15 +6,15 @@ kind: LoadTest
 metadata:
   annotations:
     pool: ${workers_pool}
-    scenario: php7_protobuf_c_extension_to_cpp_protobuf_sync_unary_ping_pong
+    scenario: php8_protobuf_c_extension_to_cpp_protobuf_sync_unary_ping_pong
     uniquifier: prebuilt
   labels:
-    language: php7_protobuf_c
+    language: php8_protobuf_c
     prefix: examples
-  name: examples-php7-protobuf-c-extension-to-cpp-protobuf-sync-unary-ping-pong-prebuilt
+  name: examples-php8-protobuf-c-extension-to-cpp-protobuf-sync-unary-ping-pong-prebuilt
 spec:
   clients:
-  - language: php7_protobuf_c
+  - language: php8_protobuf_c
     name: '0'
     pool: ${workers_pool}
     run:
@@ -25,7 +25,7 @@ spec:
         /run_scripts/run_protobuf_c_worker.sh
       command:
       - bash
-      image: ${prebuilt_image_prefix}/php7:${prebuilt_image_tag}
+      image: ${prebuilt_image_prefix}/php8:${prebuilt_image_tag}
       name: main
   driver:
     language: cxx
@@ -39,7 +39,7 @@ spec:
   scenariosJSON: |
     {
       "scenarios": {
-        "name": "php7_protobuf_c_extension_to_cpp_protobuf_sync_unary_ping_pong",
+        "name": "php8_protobuf_c_extension_to_cpp_protobuf_sync_unary_ping_pong",
         "num_servers": 1,
         "num_clients": 1,
         "client_config": {

config/samples/templates/psm/php7_example_loadtest_proxied.yaml → config/samples/templates/psm/php8_example_loadtest_proxied.yaml

@@ -6,12 +6,12 @@ kind: LoadTest
 metadata:
   annotations:
     enablePrometheus: 'true'
-    scenario: php7_protobuf_php_extension_to_cpp_protobuf_async_unary_5000rpcs_1KB_psm_8channels_16threads_5000load
+    scenario: php8_protobuf_php_extension_to_cpp_protobuf_async_unary_5000rpcs_1KB_psm_8channels_16threads_5000load
     uniquifier: proxied
   labels:
-    language: php7
+    language: php8
     prefix: psm-examples
-  name: psm-examples-php7-protobuf-php-extension-to-cpp-protobuf-async-unary-5000rpcs-1kb-psm-8channels-16threads-5000load-proxied
+  name: psm-examples-php8-protobuf-php-extension-to-cpp-protobuf-async-unary-5000rpcs-1kb-psm-8channels-16threads-5000load-proxied
 spec:
   clients:
   - build:
@@ -21,7 +21,7 @@ spec:
     clone:
       gitRef: master
       repo: https://github.com/grpc/grpc.git
-    language: php7
+    language: php8
     name: '0'
     run:
     - args:
@@ -60,7 +60,7 @@ spec:
   scenariosJSON: |
     {
       "scenarios": {
-        "name": "php7_protobuf_php_extension_to_cpp_protobuf_async_unary_5000rpcs_1KB_psm_8channels_16threads_5000load",
+        "name": "php8_protobuf_php_extension_to_cpp_protobuf_async_unary_5000rpcs_1KB_psm_8channels_16threads_5000load",
         "num_servers": 1,
         "num_clients": 1,
         "client_config": {

config/samples/templates/psm/php7_example_loadtest_proxyless.yaml → config/samples/templates/psm/php8_example_loadtest_proxyless.yaml

@@ -6,12 +6,12 @@ kind: LoadTest
 metadata:
   annotations:
     enablePrometheus: 'true'
-    scenario: php7_protobuf_php_extension_to_cpp_protobuf_async_unary_5000rpcs_1KB_psm_8channels_16threads_5000load
+    scenario: php8_protobuf_php_extension_to_cpp_protobuf_async_unary_5000rpcs_1KB_psm_8channels_16threads_5000load
     uniquifier: proxyless
   labels:
-    language: php7
+    language: php8
     prefix: psm-examples
-  name: psm-examples-php7-protobuf-php-extension-to-cpp-protobuf-async-unary-5000rpcs-1kb-psm-8channels-16threads-5000load-proxyless
+  name: psm-examples-php8-protobuf-php-extension-to-cpp-protobuf-async-unary-5000rpcs-1kb-psm-8channels-16threads-5000load-proxyless
 spec:
   clients:
   - build:
@@ -21,7 +21,7 @@ spec:
     clone:
       gitRef: master
       repo: https://github.com/grpc/grpc.git
-    language: php7
+    language: php8
     name: '0'
     run:
     - args:
@@ -56,7 +56,7 @@ spec:
   scenariosJSON: |
     {
       "scenarios": {
-        "name": "php7_protobuf_php_extension_to_cpp_protobuf_async_unary_5000rpcs_1KB_psm_8channels_16threads_5000load",
+        "name": "php8_protobuf_php_extension_to_cpp_protobuf_async_unary_5000rpcs_1KB_psm_8channels_16threads_5000load",
         "num_servers": 1,
         "num_clients": 1,
         "client_config": {

config/samples/templates/psm/php7_protobuf_c_example_loadtest_proxied.yaml → config/samples/templates/psm/php8_protobuf_c_example_loadtest_proxied.yaml

@@ -6,12 +6,12 @@ kind: LoadTest
 metadata:
   annotations:
     enablePrometheus: 'true'
-    scenario: php7_protobuf_c_extension_to_cpp_protobuf_async_unary_5000rpcs_1KB_psm_8channels_16threads_5000load
+    scenario: php8_protobuf_c_extension_to_cpp_protobuf_async_unary_5000rpcs_1KB_psm_8channels_16threads_5000load
     uniquifier: proxied
   labels:
-    language: php7_protobuf_c
+    language: php8_protobuf_c
     prefix: psm-examples
-  name: psm-examples-php7-protobuf-c-extension-to-cpp-protobuf-async-unary-5000rpcs-1kb-psm-8channels-16threads-5000load-proxied
+  name: psm-examples-php8-protobuf-c-extension-to-cpp-protobuf-async-unary-5000rpcs-1kb-psm-8channels-16threads-5000load-proxied
 spec:
   clients:
   - build:
@@ -21,7 +21,7 @@ spec:
     clone:
       gitRef: master
       repo: https://github.com/grpc/grpc.git
-    language: php7_protobuf_c
+    language: php8_protobuf_c
     name: '0'
     run:
     - args:
@@ -60,7 +60,7 @@ spec:
   scenariosJSON: |
     {
       "scenarios": {
-        "name": "php7_protobuf_c_extension_to_cpp_protobuf_async_unary_5000rpcs_1KB_psm_8channels_16threads_5000load",
+        "name": "php8_protobuf_c_extension_to_cpp_protobuf_async_unary_5000rpcs_1KB_psm_8channels_16threads_5000load",
         "num_servers": 1,
         "num_clients": 1,
         "client_config": {

config/samples/templates/psm/php7_protobuf_c_example_loadtest_proxyless.yaml → config/samples/templates/psm/php8_protobuf_c_example_loadtest_proxyless.yaml

@@ -6,12 +6,12 @@ kind: LoadTest
 metadata:
   annotations:
     enablePrometheus: 'true'
-    scenario: php7_protobuf_c_extension_to_cpp_protobuf_async_unary_5000rpcs_1KB_psm_8channels_16threads_5000load
+    scenario: php8_protobuf_c_extension_to_cpp_protobuf_async_unary_5000rpcs_1KB_psm_8channels_16threads_5000load
     uniquifier: proxyless
   labels:
-    language: php7_protobuf_c
+    language: php8_protobuf_c
     prefix: psm-examples
-  name: psm-examples-php7-protobuf-c-extension-to-cpp-protobuf-async-unary-5000rpcs-1kb-psm-8channels-16threads-5000load-proxyless
+  name: psm-examples-php8-protobuf-c-extension-to-cpp-protobuf-async-unary-5000rpcs-1kb-psm-8channels-16threads-5000load-proxyless
 spec:
   clients:
   - build:
@@ -21,7 +21,7 @@ spec:
     clone:
       gitRef: master
       repo: https://github.com/grpc/grpc.git
-    language: php7_protobuf_c
+    language: php8_protobuf_c
     name: '0'
     run:
     - args:
@@ -56,7 +56,7 @@ spec:
   scenariosJSON: |
     {
       "scenarios": {
-        "name": "php7_protobuf_c_extension_to_cpp_protobuf_async_unary_5000rpcs_1KB_psm_8channels_16threads_5000load",
+        "name": "php8_protobuf_c_extension_to_cpp_protobuf_async_unary_5000rpcs_1KB_psm_8channels_16threads_5000load",
         "num_servers": 1,
         "num_clients": 1,
         "client_config": {

config/samples/templates/psm/prebuilt/php7_example_loadtest_proxied_with_prebuilt_workers.yaml → config/samples/templates/psm/prebuilt/php8_example_loadtest_proxied_with_prebuilt_workers.yaml

@@ -7,15 +7,15 @@ metadata:
   annotations:
     enablePrometheus: 'true'
     pool: ${workers_pool}
-    scenario: php7_protobuf_php_extension_to_cpp_protobuf_async_unary_5000rpcs_1KB_psm_8channels_16threads_5000load
+    scenario: php8_protobuf_php_extension_to_cpp_protobuf_async_unary_5000rpcs_1KB_psm_8channels_16threads_5000load
     uniquifier: prebuilt-proxied
   labels:
-    language: php7
+    language: php8
     prefix: psm-examples
-  name: psm-examples-php7-protobuf-php-extension-to-cpp-protobuf-async-unary-5000rpcs-1kb-psm-8channels-16threads-5000load-prebuilt-proxied
+  name: psm-examples-php8-protobuf-php-extension-to-cpp-protobuf-async-unary-5000rpcs-1kb-psm-8channels-16threads-5000load-prebuilt-proxied
 spec:
   clients:
-  - language: php7
+  - language: php8
     name: '0'
     pool: ${workers_pool}
     run:
@@ -26,7 +26,7 @@ spec:
         /run_scripts/run_worker.sh
       command:
       - bash
-      image: ${prebuilt_image_prefix}/php7:${prebuilt_image_tag}
+      image: ${prebuilt_image_prefix}/php8:${prebuilt_image_tag}
       name: main
     - args:
       - -default-config-path
@@ -61,7 +61,7 @@ spec:
   scenariosJSON: |
     {
       "scenarios": {
-        "name": "php7_protobuf_php_extension_to_cpp_protobuf_async_unary_5000rpcs_1KB_psm_8channels_16threads_5000load",
+        "name": "php8_protobuf_php_extension_to_cpp_protobuf_async_unary_5000rpcs_1KB_psm_8channels_16threads_5000load",
         "num_servers": 1,
         "num_clients": 1,
         "client_config": {