Merge https://github.com/grpc/grpc into v3-server-auth

src/core/lib/transport/metadata_batch.h

@@ -410,7 +410,8 @@ struct GrpcLbClientStatsMetadata {
   static const char* DisplayMemento(MementoType) {
     return "<internal-lb-stats>";
   }
-  static MementoType ParseMemento(Slice, bool, MetadataParseErrorFn) {
+  static MementoType ParseMemento(Slice, bool, MetadataParseErrorFn error) {
+    error("not a valid value for grpclb_client_stats", Slice());
     return nullptr;
   }
 };

tools/internal_ci/linux/grpc_xds_k8s_install_test_driver.sh

@@ -18,11 +18,11 @@ set -eo pipefail
 # Constants
 readonly PYTHON_VERSION="${PYTHON_VERSION:-3.10}"
 # Test driver
-readonly TEST_DRIVER_REPO_NAME="grpc"
-readonly TEST_DRIVER_REPO_URL="https://github.com/${TEST_DRIVER_REPO_OWNER:-grpc}/grpc.git"
-readonly TEST_DRIVER_BRANCH="${TEST_DRIVER_BRANCH:-master}"
-readonly TEST_DRIVER_PATH="tools/run_tests/xds_k8s_test_driver"
-readonly TEST_DRIVER_PROTOS_PATH="src/proto/grpc/testing"
+readonly TEST_DRIVER_REPO_NAME="psm-interop"
+readonly TEST_DRIVER_REPO_URL="https://github.com/${TEST_DRIVER_REPO_OWNER:-grpc}/psm-interop.git"
+readonly TEST_DRIVER_BRANCH="${TEST_DRIVER_BRANCH:-main}"
+readonly TEST_DRIVER_PATH=""
+readonly TEST_DRIVER_PROTOS_PATH="protos/grpc/testing"
 readonly FORCE_TESTING_VERSION="${FORCE_TESTING_VERSION:-}"
 
 # GKE cluster identifiers.
@@ -261,7 +261,7 @@ test_driver_pip_install() {
 #   Writes the output of `python -m grpc_tools.protoc` to stdout, stderr
 #   Writes the list if compiled python code to stdout
 #   Writes compiled python code with proto messages and grpc services to
-#   $TEST_DRIVER_FULL_DIR/src/proto
+#   $TEST_DRIVER_FULL_DIR/protos/grpc/testing
 #######################################
 test_driver_compile_protos() {
   declare -a protos
@@ -296,7 +296,7 @@ test_driver_compile_protos() {
 #######################################
 test_driver_install() {
   readonly TEST_DRIVER_REPO_DIR="${1:?Usage test_driver_install TEST_DRIVER_REPO_DIR}"
-  readonly TEST_DRIVER_FULL_DIR="${TEST_DRIVER_REPO_DIR}/${TEST_DRIVER_PATH}"
+  readonly TEST_DRIVER_FULL_DIR="${TEST_DRIVER_REPO_DIR}"
   test_driver_get_source
   test_driver_pip_install
   test_driver_compile_protos

tools/internal_ci/macos/pull_request/grpc_bazel_cpp_ios_event_engine_experiment_tests.cfg

@@ -1,42 +0,0 @@
-# Copyright 2023 The 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.
-
-# Config file for the internal CI (in protobuf text format)
-
-# Location of the continuous shell script in repository.
-build_file: "grpc/tools/internal_ci/macos/grpc_run_bazel_cpp_ios_tests.sh"
-timeout_mins: 90
-action {
-  define_artifacts {
-    regex: "**/*sponge_log.*"
-    regex: "github/grpc/reports/**"
-  }
-}
-
-gfile_resources: "/bigstore/grpc-testing-secrets/gcp_credentials/GrpcTesting-d0eeee2db331.json"
-gfile_resources: "/bigstore/grpc-testing-secrets/gcp_credentials/resultstore_api_key"
-
-bazel_setting {
-  # In order for Kokoro to recognize this as a bazel build and publish the bazel resultstore link,
-  # the bazel_setting section needs to be present and "upsalite_frontend_address" needs to be
-  # set. The rest of configuration from bazel_setting is unused (we configure everything when bazel
-  # command is invoked).
-  upsalite_frontend_address: "https://source.cloud.google.com"
-}
-
-env_vars {
-  # flags will be passed to bazel invocation
-  key: "BAZEL_FLAGS"
-  value: "--config=dbg --cxxopt=-DGRPC_IOS_EVENT_ENGINE_CLIENT=1"
-}