diff --git a/native/BUILD b/native/BUILD index f1b4cf68c1..b4054704ae 100644 --- a/native/BUILD +++ b/native/BUILD @@ -215,7 +215,7 @@ g_stands_for = "gjallarhorn" # @unused core_version = "37.0.0" # @unused -version = "1.60.0" # @unused +version = "1.60.1" # @unused GPR_PUBLIC_HDRS = [ "include/grpc/support/alloc.h", diff --git a/native/CMakeLists.txt b/native/CMakeLists.txt index 06e6453b5c..9e9bd24ee4 100644 --- a/native/CMakeLists.txt +++ b/native/CMakeLists.txt @@ -25,10 +25,10 @@ cmake_minimum_required(VERSION 3.8) set(PACKAGE_NAME "grpc") -set(PACKAGE_VERSION "1.60.0") +set(PACKAGE_VERSION "1.60.1") set(gRPC_CORE_VERSION "37.0.0") set(gRPC_CORE_SOVERSION "37") -set(gRPC_CPP_VERSION "1.60.0") +set(gRPC_CPP_VERSION "1.60.1") set(gRPC_CPP_SOVERSION "1.60") set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") set(PACKAGE_TARNAME "${PACKAGE_NAME}-${PACKAGE_VERSION}") diff --git a/native/Makefile b/native/Makefile index 6e28210460..30b3b4348d 100644 --- a/native/Makefile +++ b/native/Makefile @@ -411,7 +411,7 @@ Q = @ endif CORE_VERSION = 37.0.0 -CPP_VERSION = 1.60.0 +CPP_VERSION = 1.60.1 CPPFLAGS_NO_ARCH += $(addprefix -I, $(INCLUDES)) $(addprefix -D, $(DEFINES)) CPPFLAGS += $(CPPFLAGS_NO_ARCH) $(ARCH_FLAGS) diff --git a/native/REVISION.txt b/native/REVISION.txt index 1b881300fd..6d9b2130be 100644 --- a/native/REVISION.txt +++ b/native/REVISION.txt @@ -1 +1 @@ -0ef13a7555dbaadd4633399242524129eef5e231 +e5ae3b6b44bf3b64d24bfb4b4f82556239b986db diff --git a/native/_metadata.py b/native/_metadata.py index dcdc2268d3..beb5d81e49 100644 --- a/native/_metadata.py +++ b/native/_metadata.py @@ -14,4 +14,4 @@ # AUTO-GENERATED FROM `$REPO_ROOT/templates/_metadata.py.template`!!! -__version__ = """1.60.0""" +__version__ = """1.60.1""" diff --git a/native/build_handwritten.yaml b/native/build_handwritten.yaml index 28b101d031..277e202929 100644 --- a/native/build_handwritten.yaml +++ b/native/build_handwritten.yaml @@ -16,7 +16,7 @@ settings: csharp_major_version: 2 g_stands_for: gjallarhorn protobuf_version: 3.25.0 - version: 1.60.0 + version: 1.60.1 configs: asan: CC: clang diff --git a/native/config.m4 b/native/config.m4 index 184cdd6ae0..1411a7e286 100644 --- a/native/config.m4 +++ b/native/config.m4 @@ -1348,7 +1348,7 @@ if test "$PHP_GRPC" != "no"; then -D_HAS_EXCEPTIONS=0 -DNOMINMAX -DGRPC_ARES=0 \ -DGRPC_POSIX_FORK_ALLOW_PTHREAD_ATFORK=1 \ -DGRPC_XDS_USER_AGENT_NAME_SUFFIX='"\"PHP\""' \ - -DGRPC_XDS_USER_AGENT_VERSION_SUFFIX='"\"1.60.0\""') + -DGRPC_XDS_USER_AGENT_VERSION_SUFFIX='"\"1.60.1\""') PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/backend_metrics) PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/census) diff --git a/native/gRPC-C++.podspec b/native/gRPC-C++.podspec index 8d7b7ea0ba..cf0667371b 100644 --- a/native/gRPC-C++.podspec +++ b/native/gRPC-C++.podspec @@ -22,7 +22,7 @@ Pod::Spec.new do |s| s.name = 'gRPC-C++' # TODO (mxyan): use version that match gRPC version when pod is stabilized - version = '1.60.0' + version = '1.60.1' s.version = version s.summary = 'gRPC C++ library' s.homepage = 'https://grpc.io' diff --git a/native/gRPC-Core.podspec b/native/gRPC-Core.podspec index 59217810c4..3e812ccfef 100644 --- a/native/gRPC-Core.podspec +++ b/native/gRPC-Core.podspec @@ -21,7 +21,7 @@ Pod::Spec.new do |s| s.name = 'gRPC-Core' - version = '1.60.0' + version = '1.60.1' s.version = version s.summary = 'Core cross-platform gRPC library, written in C' s.homepage = 'https://grpc.io' diff --git a/native/gRPC-ProtoRPC.podspec b/native/gRPC-ProtoRPC.podspec index 82724c1084..da762890d1 100644 --- a/native/gRPC-ProtoRPC.podspec +++ b/native/gRPC-ProtoRPC.podspec @@ -21,7 +21,7 @@ Pod::Spec.new do |s| s.name = 'gRPC-ProtoRPC' - version = '1.60.0' + version = '1.60.1' s.version = version s.summary = 'RPC library for Protocol Buffers, based on gRPC' s.homepage = 'https://grpc.io' diff --git a/native/gRPC-RxLibrary.podspec b/native/gRPC-RxLibrary.podspec index c9bd618197..879d746bdb 100644 --- a/native/gRPC-RxLibrary.podspec +++ b/native/gRPC-RxLibrary.podspec @@ -21,7 +21,7 @@ Pod::Spec.new do |s| s.name = 'gRPC-RxLibrary' - version = '1.60.0' + version = '1.60.1' s.version = version s.summary = 'Reactive Extensions library for iOS/OSX.' s.homepage = 'https://grpc.io' diff --git a/native/gRPC.podspec b/native/gRPC.podspec index cd36a31b34..70529eaa18 100644 --- a/native/gRPC.podspec +++ b/native/gRPC.podspec @@ -20,7 +20,7 @@ Pod::Spec.new do |s| s.name = 'gRPC' - version = '1.60.0' + version = '1.60.1' s.version = version s.summary = 'gRPC client library for iOS/OSX' s.homepage = 'https://grpc.io' diff --git a/native/include/grpcpp/version_info.h b/native/include/grpcpp/version_info.h index afc040cc13..07146f0ceb 100644 --- a/native/include/grpcpp/version_info.h +++ b/native/include/grpcpp/version_info.h @@ -20,8 +20,8 @@ #define GRPC_CPP_VERSION_MAJOR 1 #define GRPC_CPP_VERSION_MINOR 60 -#define GRPC_CPP_VERSION_PATCH 0 +#define GRPC_CPP_VERSION_PATCH 1 #define GRPC_CPP_VERSION_TAG "" -#define GRPC_CPP_VERSION_STRING "1.60.0" +#define GRPC_CPP_VERSION_STRING "1.60.1" #endif // GRPCPP_VERSION_INFO_H diff --git a/native/package.xml b/native/package.xml index 1098323199..7218fccc45 100644 --- a/native/package.xml +++ b/native/package.xml @@ -13,8 +13,8 @@ 2019-09-24 - 1.60.0 - 1.60.0 + 1.60.1 + 1.60.1 stable @@ -22,7 +22,7 @@ Apache 2.0 -- gRPC Core 1.60.0 update +- gRPC Core 1.60.1 update diff --git a/native/src/csharp/build/dependencies.props b/native/src/csharp/build/dependencies.props index bcc831bf47..c8168a22f7 100644 --- a/native/src/csharp/build/dependencies.props +++ b/native/src/csharp/build/dependencies.props @@ -1,7 +1,7 @@ - 2.60.0 + 2.60.1 3.25.0 diff --git a/native/src/objective-c/!ProtoCompiler-gRPCCppPlugin.podspec b/native/src/objective-c/!ProtoCompiler-gRPCCppPlugin.podspec index c0b2fc229e..4b4fa1a38f 100644 --- a/native/src/objective-c/!ProtoCompiler-gRPCCppPlugin.podspec +++ b/native/src/objective-c/!ProtoCompiler-gRPCCppPlugin.podspec @@ -42,7 +42,7 @@ Pod::Spec.new do |s| # exclamation mark ensures that other "regular" pods will be able to find it as it'll be installed # before them. s.name = '!ProtoCompiler-gRPCCppPlugin' - v = '1.60.0' + v = '1.60.1' s.version = v s.summary = 'The gRPC ProtoC plugin generates C++ files from .proto services.' s.description = <<-DESC diff --git a/native/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec b/native/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec index b070480696..b2e9584aaf 100644 --- a/native/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec +++ b/native/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec @@ -42,7 +42,7 @@ Pod::Spec.new do |s| # exclamation mark ensures that other "regular" pods will be able to find it as it'll be installed # before them. s.name = '!ProtoCompiler-gRPCPlugin' - v = '1.60.0' + v = '1.60.1' s.version = v s.summary = 'The gRPC ProtoC plugin generates Objective-C files from .proto services.' s.description = <<-DESC diff --git a/native/src/objective-c/GRPCClient/version.h b/native/src/objective-c/GRPCClient/version.h index 03f5d97987..2023d17283 100644 --- a/native/src/objective-c/GRPCClient/version.h +++ b/native/src/objective-c/GRPCClient/version.h @@ -22,4 +22,4 @@ // instead. This file can be regenerated from the template by running // `tools/buildgen/generate_projects.sh`. -#define GRPC_OBJC_VERSION_STRING @"1.60.0" +#define GRPC_OBJC_VERSION_STRING @"1.60.1" diff --git a/native/src/objective-c/tests/version.h b/native/src/objective-c/tests/version.h index 0ff80fe8f0..554d7f64b0 100644 --- a/native/src/objective-c/tests/version.h +++ b/native/src/objective-c/tests/version.h @@ -22,5 +22,5 @@ // instead. This file can be regenerated from the template by running // `tools/buildgen/generate_projects.sh`. -#define GRPC_OBJC_VERSION_STRING @"1.60.0" +#define GRPC_OBJC_VERSION_STRING @"1.60.1" #define GRPC_C_VERSION_STRING @"37.0.0" diff --git a/native/src/php/composer.json b/native/src/php/composer.json index 774bacbd82..a66219bd8a 100644 --- a/native/src/php/composer.json +++ b/native/src/php/composer.json @@ -2,7 +2,7 @@ "name": "grpc/grpc-dev", "description": "gRPC library for PHP - for Development use only", "license": "Apache-2.0", - "version": "1.60.0", + "version": "1.60.1", "require": { "php": ">=7.0.0", "google/protobuf": "^v3.3.0" diff --git a/native/src/php/ext/grpc/version.h b/native/src/php/ext/grpc/version.h index 191accbb25..1436674a31 100644 --- a/native/src/php/ext/grpc/version.h +++ b/native/src/php/ext/grpc/version.h @@ -20,6 +20,6 @@ #ifndef VERSION_H #define VERSION_H -#define PHP_GRPC_VERSION "1.60.0" +#define PHP_GRPC_VERSION "1.60.1" #endif /* VERSION_H */ diff --git a/native/src/python/grpcio/grpc/_grpcio_metadata.py b/native/src/python/grpcio/grpc/_grpcio_metadata.py index 7cf21386c3..99bf43ea84 100644 --- a/native/src/python/grpcio/grpc/_grpcio_metadata.py +++ b/native/src/python/grpcio/grpc/_grpcio_metadata.py @@ -14,4 +14,4 @@ # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio/grpc/_grpcio_metadata.py.template`!!! -__version__ = """1.60.0""" +__version__ = """1.60.1""" diff --git a/native/src/python/grpcio/grpc/_server.py b/native/src/python/grpcio/grpc/_server.py index 595056136b..4ea1d5e459 100644 --- a/native/src/python/grpcio/grpc/_server.py +++ b/native/src/python/grpcio/grpc/_server.py @@ -579,7 +579,7 @@ def _call_behavior( exception.__traceback__, ) ) - traceback.print_exc() + traceback.print_exc() _LOGGER.exception(details) _abort( state, diff --git a/native/src/python/grpcio/grpc_version.py b/native/src/python/grpcio/grpc_version.py index 0449e6b6dd..a8f2ddeeb2 100644 --- a/native/src/python/grpcio/grpc_version.py +++ b/native/src/python/grpcio/grpc_version.py @@ -14,4 +14,4 @@ # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio/grpc_version.py.template`!!! -VERSION = '1.60.0' +VERSION = '1.60.1' diff --git a/native/src/python/grpcio_admin/grpc_version.py b/native/src/python/grpcio_admin/grpc_version.py index 2a4cf135d6..d9ffe4adb7 100644 --- a/native/src/python/grpcio_admin/grpc_version.py +++ b/native/src/python/grpcio_admin/grpc_version.py @@ -14,4 +14,4 @@ # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_admin/grpc_version.py.template`!!! -VERSION = '1.60.0' +VERSION = '1.60.1' diff --git a/native/src/python/grpcio_channelz/grpc_version.py b/native/src/python/grpcio_channelz/grpc_version.py index cffc7f8997..8b553d89e4 100644 --- a/native/src/python/grpcio_channelz/grpc_version.py +++ b/native/src/python/grpcio_channelz/grpc_version.py @@ -14,4 +14,4 @@ # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_channelz/grpc_version.py.template`!!! -VERSION = '1.60.0' +VERSION = '1.60.1' diff --git a/native/src/python/grpcio_csds/grpc_version.py b/native/src/python/grpcio_csds/grpc_version.py index 1b83d2bb82..6d1ebcc13d 100644 --- a/native/src/python/grpcio_csds/grpc_version.py +++ b/native/src/python/grpcio_csds/grpc_version.py @@ -14,4 +14,4 @@ # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_csds/grpc_version.py.template`!!! -VERSION = '1.60.0' +VERSION = '1.60.1' diff --git a/native/src/python/grpcio_health_checking/grpc_version.py b/native/src/python/grpcio_health_checking/grpc_version.py index 1b550ed00a..fab6307d39 100644 --- a/native/src/python/grpcio_health_checking/grpc_version.py +++ b/native/src/python/grpcio_health_checking/grpc_version.py @@ -14,4 +14,4 @@ # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_health_checking/grpc_version.py.template`!!! -VERSION = '1.60.0' +VERSION = '1.60.1' diff --git a/native/src/python/grpcio_reflection/grpc_version.py b/native/src/python/grpcio_reflection/grpc_version.py index cea84ca176..5610c4cee3 100644 --- a/native/src/python/grpcio_reflection/grpc_version.py +++ b/native/src/python/grpcio_reflection/grpc_version.py @@ -14,4 +14,4 @@ # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_reflection/grpc_version.py.template`!!! -VERSION = '1.60.0' +VERSION = '1.60.1' diff --git a/native/src/python/grpcio_status/grpc_version.py b/native/src/python/grpcio_status/grpc_version.py index c672d9d89a..7881d67cf9 100644 --- a/native/src/python/grpcio_status/grpc_version.py +++ b/native/src/python/grpcio_status/grpc_version.py @@ -14,4 +14,4 @@ # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_status/grpc_version.py.template`!!! -VERSION = '1.60.0' +VERSION = '1.60.1' diff --git a/native/src/python/grpcio_testing/grpc_version.py b/native/src/python/grpcio_testing/grpc_version.py index 3711d6f942..af9827cb8d 100644 --- a/native/src/python/grpcio_testing/grpc_version.py +++ b/native/src/python/grpcio_testing/grpc_version.py @@ -14,4 +14,4 @@ # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_testing/grpc_version.py.template`!!! -VERSION = '1.60.0' +VERSION = '1.60.1' diff --git a/native/src/python/grpcio_tests/grpc_version.py b/native/src/python/grpcio_tests/grpc_version.py index 8d324c830d..c70bae8311 100644 --- a/native/src/python/grpcio_tests/grpc_version.py +++ b/native/src/python/grpcio_tests/grpc_version.py @@ -14,4 +14,4 @@ # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_tests/grpc_version.py.template`!!! -VERSION = '1.60.0' +VERSION = '1.60.1' diff --git a/native/src/ruby/lib/grpc/version.rb b/native/src/ruby/lib/grpc/version.rb index a5f161884c..3deb328d56 100644 --- a/native/src/ruby/lib/grpc/version.rb +++ b/native/src/ruby/lib/grpc/version.rb @@ -14,5 +14,5 @@ # GRPC contains the General RPC module. module GRPC - VERSION = '1.60.0' + VERSION = '1.60.1' end diff --git a/native/src/ruby/nativedebug/version.rb b/native/src/ruby/nativedebug/version.rb index bb12e364c0..4a7a06bf9d 100644 --- a/native/src/ruby/nativedebug/version.rb +++ b/native/src/ruby/nativedebug/version.rb @@ -14,6 +14,6 @@ module GRPC module NativeDebug - VERSION = '1.60.0' + VERSION = '1.60.1' end end diff --git a/native/src/ruby/tools/version.rb b/native/src/ruby/tools/version.rb index 9568cccbeb..b488c87f31 100644 --- a/native/src/ruby/tools/version.rb +++ b/native/src/ruby/tools/version.rb @@ -14,6 +14,6 @@ module GRPC module Tools - VERSION = '1.60.0' + VERSION = '1.60.1' end end diff --git a/native/tools/distrib/python/grpc_version.py b/native/tools/distrib/python/grpc_version.py index 4cf406430f..c6aecce917 100644 --- a/native/tools/distrib/python/grpc_version.py +++ b/native/tools/distrib/python/grpc_version.py @@ -14,5 +14,5 @@ # AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/grpcio_tools/grpc_version.py.template`!!! -VERSION = '1.60.0' +VERSION = '1.60.1' PROTOBUF_VERSION = '3.25.0' diff --git a/native/tools/distrib/python/grpcio_tools/grpc_version.py b/native/tools/distrib/python/grpcio_tools/grpc_version.py index 005cf24042..a6a6b031b6 100644 --- a/native/tools/distrib/python/grpcio_tools/grpc_version.py +++ b/native/tools/distrib/python/grpcio_tools/grpc_version.py @@ -14,5 +14,5 @@ # AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/grpcio_tools/grpc_version.py.template`!!! -VERSION = '1.60.0' +VERSION = '1.60.1' PROTOBUF_VERSION = '3.25.0' diff --git a/native/tools/distrib/python/xds_protos/grpc_version.py b/native/tools/distrib/python/xds_protos/grpc_version.py index 81943d863d..a636fba9de 100644 --- a/native/tools/distrib/python/xds_protos/grpc_version.py +++ b/native/tools/distrib/python/xds_protos/grpc_version.py @@ -14,5 +14,5 @@ # AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/grpcio_tools/grpc_version.py.template`!!! -VERSION = '1.60.0' +VERSION = '1.60.1' PROTOBUF_VERSION = '3.25.0' diff --git a/native/tools/doxygen/Doxyfile.c++ b/native/tools/doxygen/Doxyfile.c++ index bb05d4a2d2..884bb15793 100644 --- a/native/tools/doxygen/Doxyfile.c++ +++ b/native/tools/doxygen/Doxyfile.c++ @@ -40,7 +40,7 @@ PROJECT_NAME = "GRPC C++" # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 1.60.0 +PROJECT_NUMBER = 1.60.1 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/native/tools/doxygen/Doxyfile.c++.internal b/native/tools/doxygen/Doxyfile.c++.internal index 1e6c9ca071..73d4ed2eb3 100644 --- a/native/tools/doxygen/Doxyfile.c++.internal +++ b/native/tools/doxygen/Doxyfile.c++.internal @@ -40,7 +40,7 @@ PROJECT_NAME = "GRPC C++" # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 1.60.0 +PROJECT_NUMBER = 1.60.1 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/native/tools/doxygen/Doxyfile.objc b/native/tools/doxygen/Doxyfile.objc index b13abbf1e8..60ea9c94e4 100644 --- a/native/tools/doxygen/Doxyfile.objc +++ b/native/tools/doxygen/Doxyfile.objc @@ -40,7 +40,7 @@ PROJECT_NAME = "GRPC Objective-C" # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 1.60.0 +PROJECT_NUMBER = 1.60.1 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/native/tools/doxygen/Doxyfile.objc.internal b/native/tools/doxygen/Doxyfile.objc.internal index 60f1e12fd2..fba61bf9ad 100644 --- a/native/tools/doxygen/Doxyfile.objc.internal +++ b/native/tools/doxygen/Doxyfile.objc.internal @@ -40,7 +40,7 @@ PROJECT_NAME = "GRPC Objective-C" # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 1.60.0 +PROJECT_NUMBER = 1.60.1 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/native/tools/doxygen/Doxyfile.php b/native/tools/doxygen/Doxyfile.php index c5c1fe6780..7a68713ba4 100644 --- a/native/tools/doxygen/Doxyfile.php +++ b/native/tools/doxygen/Doxyfile.php @@ -40,7 +40,7 @@ # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 1.60.0 +PROJECT_NUMBER = 1.60.1 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/native/tools/internal_ci/linux/grpc_xds_k8s_lb.sh b/native/tools/internal_ci/linux/grpc_xds_k8s_lb.sh index 78dc6f3c26..e2c8daa82d 100755 --- a/native/tools/internal_ci/linux/grpc_xds_k8s_lb.sh +++ b/native/tools/internal_ci/linux/grpc_xds_k8s_lb.sh @@ -17,7 +17,7 @@ set -eo pipefail # Constants readonly GITHUB_REPOSITORY_NAME="grpc" -readonly TEST_DRIVER_INSTALL_SCRIPT_URL="https://raw.githubusercontent.com/${TEST_DRIVER_REPO_OWNER:-grpc}/grpc/${TEST_DRIVER_BRANCH:-master}/tools/internal_ci/linux/grpc_xds_k8s_install_test_driver.sh" +readonly TEST_DRIVER_INSTALL_SCRIPT_URL="https://raw.githubusercontent.com/${TEST_DRIVER_REPO_OWNER:-grpc}/psm-interop/${TEST_DRIVER_BRANCH:-main}/.kokoro/psm_interop_kokoro_lib.sh" ## xDS test client Docker images readonly SERVER_IMAGE_NAME="gcr.io/grpc-testing/xds-interop/cpp-server" readonly CLIENT_IMAGE_NAME="gcr.io/grpc-testing/xds-interop/cpp-client" diff --git a/native/tools/internal_ci/linux/grpc_xds_k8s_lb_python.sh b/native/tools/internal_ci/linux/grpc_xds_k8s_lb_python.sh index 71d4e578ef..10c1525fcf 100755 --- a/native/tools/internal_ci/linux/grpc_xds_k8s_lb_python.sh +++ b/native/tools/internal_ci/linux/grpc_xds_k8s_lb_python.sh @@ -17,7 +17,7 @@ set -eo pipefail # Constants readonly GITHUB_REPOSITORY_NAME="grpc" -readonly TEST_DRIVER_INSTALL_SCRIPT_URL="https://raw.githubusercontent.com/${TEST_DRIVER_REPO_OWNER:-grpc}/grpc/${TEST_DRIVER_BRANCH:-master}/tools/internal_ci/linux/grpc_xds_k8s_install_test_driver.sh" +readonly TEST_DRIVER_INSTALL_SCRIPT_URL="https://raw.githubusercontent.com/${TEST_DRIVER_REPO_OWNER:-grpc}/psm-interop/${TEST_DRIVER_BRANCH:-main}/.kokoro/psm_interop_kokoro_lib.sh" ## xDS test client Docker images readonly SERVER_IMAGE_NAME="gcr.io/grpc-testing/xds-interop/python-server" readonly CLIENT_IMAGE_NAME="gcr.io/grpc-testing/xds-interop/python-client" diff --git a/native/tools/internal_ci/linux/grpc_xds_k8s_xbranch.sh b/native/tools/internal_ci/linux/grpc_xds_k8s_xbranch.sh index 09204d88ed..673ff41e67 100644 --- a/native/tools/internal_ci/linux/grpc_xds_k8s_xbranch.sh +++ b/native/tools/internal_ci/linux/grpc_xds_k8s_xbranch.sh @@ -17,7 +17,7 @@ set -eo pipefail # Constants readonly GITHUB_REPOSITORY_NAME="grpc" -readonly TEST_DRIVER_INSTALL_SCRIPT_URL="https://raw.githubusercontent.com/${TEST_DRIVER_REPO_OWNER:-grpc}/grpc/${TEST_DRIVER_BRANCH:-master}/tools/internal_ci/linux/grpc_xds_k8s_install_test_driver.sh" +readonly TEST_DRIVER_INSTALL_SCRIPT_URL="https://raw.githubusercontent.com/${TEST_DRIVER_REPO_OWNER:-grpc}/psm-interop/${TEST_DRIVER_BRANCH:-main}/.kokoro/psm_interop_kokoro_lib.sh" readonly LANGS="cpp go java" readonly MAIN_BRANCH="${MAIN_BRANCH:-master}" diff --git a/native/tools/internal_ci/linux/grpc_xds_k8s_xlang.sh b/native/tools/internal_ci/linux/grpc_xds_k8s_xlang.sh index cab473f7c6..6a84456133 100755 --- a/native/tools/internal_ci/linux/grpc_xds_k8s_xlang.sh +++ b/native/tools/internal_ci/linux/grpc_xds_k8s_xlang.sh @@ -17,7 +17,7 @@ set -eo pipefail # Constants readonly GITHUB_REPOSITORY_NAME="grpc" -readonly TEST_DRIVER_INSTALL_SCRIPT_URL="https://raw.githubusercontent.com/${TEST_DRIVER_REPO_OWNER:-grpc}/grpc/${TEST_DRIVER_BRANCH:-master}/tools/internal_ci/linux/grpc_xds_k8s_install_test_driver.sh" +readonly TEST_DRIVER_INSTALL_SCRIPT_URL="https://raw.githubusercontent.com/${TEST_DRIVER_REPO_OWNER:-grpc}/psm-interop/${TEST_DRIVER_BRANCH:-main}/.kokoro/psm_interop_kokoro_lib.sh" ## xDS test server/client Docker images readonly SERVER_LANGS="cpp go java" readonly CLIENT_LANGS="cpp go java" diff --git a/native/tools/internal_ci/linux/grpc_xds_resource_cleanup.sh b/native/tools/internal_ci/linux/grpc_xds_resource_cleanup.sh index ad212f505a..7a7a9bc386 100644 --- a/native/tools/internal_ci/linux/grpc_xds_resource_cleanup.sh +++ b/native/tools/internal_ci/linux/grpc_xds_resource_cleanup.sh @@ -17,7 +17,7 @@ set -eo pipefail # Constants readonly GITHUB_REPOSITORY_NAME="grpc" -readonly TEST_DRIVER_INSTALL_SCRIPT_URL="https://raw.githubusercontent.com/${TEST_DRIVER_REPO_OWNER:-grpc}/grpc/${TEST_DRIVER_BRANCH:-master}/tools/internal_ci/linux/grpc_xds_k8s_install_test_driver.sh" +readonly TEST_DRIVER_INSTALL_SCRIPT_URL="https://raw.githubusercontent.com/${TEST_DRIVER_REPO_OWNER:-grpc}/psm-interop/${TEST_DRIVER_BRANCH:-main}/.kokoro/psm_interop_kokoro_lib.sh" # Keep orphaned resources last 2 days. readonly KEEP_HOURS="${KEEP_HOURS:-48}" diff --git a/native/tools/internal_ci/linux/grpc_xds_url_map.sh b/native/tools/internal_ci/linux/grpc_xds_url_map.sh index 8137d029b7..324494d757 100755 --- a/native/tools/internal_ci/linux/grpc_xds_url_map.sh +++ b/native/tools/internal_ci/linux/grpc_xds_url_map.sh @@ -17,7 +17,7 @@ set -eo pipefail # Constants readonly GITHUB_REPOSITORY_NAME="grpc" -readonly TEST_DRIVER_INSTALL_SCRIPT_URL="https://raw.githubusercontent.com/${TEST_DRIVER_REPO_OWNER:-grpc}/grpc/${TEST_DRIVER_BRANCH:-master}/tools/internal_ci/linux/grpc_xds_k8s_install_test_driver.sh" +readonly TEST_DRIVER_INSTALL_SCRIPT_URL="https://raw.githubusercontent.com/${TEST_DRIVER_REPO_OWNER:-grpc}/psm-interop/${TEST_DRIVER_BRANCH:-main}/.kokoro/psm_interop_kokoro_lib.sh" ## xDS test client Docker images readonly CLIENT_IMAGE_NAME="gcr.io/grpc-testing/xds-interop/cpp-client" readonly FORCE_IMAGE_BUILD="${FORCE_IMAGE_BUILD:-0}" diff --git a/native/tools/internal_ci/linux/grpc_xds_url_map_python.sh b/native/tools/internal_ci/linux/grpc_xds_url_map_python.sh index 32545293dc..541d5875df 100755 --- a/native/tools/internal_ci/linux/grpc_xds_url_map_python.sh +++ b/native/tools/internal_ci/linux/grpc_xds_url_map_python.sh @@ -17,7 +17,7 @@ set -eo pipefail # Constants readonly GITHUB_REPOSITORY_NAME="grpc" -readonly TEST_DRIVER_INSTALL_SCRIPT_URL="https://raw.githubusercontent.com/${TEST_DRIVER_REPO_OWNER:-grpc}/grpc/${TEST_DRIVER_BRANCH:-master}/tools/internal_ci/linux/grpc_xds_k8s_install_test_driver.sh" +readonly TEST_DRIVER_INSTALL_SCRIPT_URL="https://raw.githubusercontent.com/${TEST_DRIVER_REPO_OWNER:-grpc}/psm-interop/${TEST_DRIVER_BRANCH:-main}/.kokoro/psm_interop_kokoro_lib.sh" ## xDS test client Docker images readonly CLIENT_IMAGE_NAME="gcr.io/grpc-testing/xds-interop/python-client" readonly FORCE_IMAGE_BUILD="${FORCE_IMAGE_BUILD:-0}" diff --git a/native/tools/internal_ci/linux/psm-csm.sh b/native/tools/internal_ci/linux/psm-csm.sh index b58e074713..ecdf113006 100755 --- a/native/tools/internal_ci/linux/psm-csm.sh +++ b/native/tools/internal_ci/linux/psm-csm.sh @@ -17,7 +17,7 @@ set -eo pipefail # Constants readonly GITHUB_REPOSITORY_NAME="grpc" -readonly TEST_DRIVER_INSTALL_SCRIPT_URL="https://raw.githubusercontent.com/${TEST_DRIVER_REPO_OWNER:-grpc}/grpc/${TEST_DRIVER_BRANCH:-master}/tools/internal_ci/linux/grpc_xds_k8s_install_test_driver.sh" +readonly TEST_DRIVER_INSTALL_SCRIPT_URL="https://raw.githubusercontent.com/${TEST_DRIVER_REPO_OWNER:-grpc}/psm-interop/${TEST_DRIVER_BRANCH:-main}/.kokoro/psm_interop_kokoro_lib.sh" ## xDS test server/client Docker images readonly SERVER_IMAGE_NAME="gcr.io/grpc-testing/xds-interop/cpp-server" readonly CLIENT_IMAGE_NAME="gcr.io/grpc-testing/xds-interop/cpp-client" diff --git a/native/tools/internal_ci/linux/psm-security-python.sh b/native/tools/internal_ci/linux/psm-security-python.sh index bda9ed8347..d746b79c8f 100755 --- a/native/tools/internal_ci/linux/psm-security-python.sh +++ b/native/tools/internal_ci/linux/psm-security-python.sh @@ -17,7 +17,7 @@ set -eo pipefail # Constants readonly GITHUB_REPOSITORY_NAME="grpc" -readonly TEST_DRIVER_INSTALL_SCRIPT_URL="https://raw.githubusercontent.com/${TEST_DRIVER_REPO_OWNER:-grpc}/grpc/${TEST_DRIVER_BRANCH:-master}/tools/internal_ci/linux/grpc_xds_k8s_install_test_driver.sh" +readonly TEST_DRIVER_INSTALL_SCRIPT_URL="https://raw.githubusercontent.com/${TEST_DRIVER_REPO_OWNER:-grpc}/psm-interop/${TEST_DRIVER_BRANCH:-main}/.kokoro/psm_interop_kokoro_lib.sh" ## xDS test server/client Docker images readonly SERVER_IMAGE_NAME="gcr.io/grpc-testing/xds-interop/python-server" readonly CLIENT_IMAGE_NAME="gcr.io/grpc-testing/xds-interop/python-client" diff --git a/native/tools/internal_ci/linux/psm-security.sh b/native/tools/internal_ci/linux/psm-security.sh index 8c102d1b7f..48c006ffce 100755 --- a/native/tools/internal_ci/linux/psm-security.sh +++ b/native/tools/internal_ci/linux/psm-security.sh @@ -17,7 +17,7 @@ set -eo pipefail # Constants readonly GITHUB_REPOSITORY_NAME="grpc" -readonly TEST_DRIVER_INSTALL_SCRIPT_URL="https://raw.githubusercontent.com/${TEST_DRIVER_REPO_OWNER:-grpc}/grpc/${TEST_DRIVER_BRANCH:-master}/tools/internal_ci/linux/grpc_xds_k8s_install_test_driver.sh" +readonly TEST_DRIVER_INSTALL_SCRIPT_URL="https://raw.githubusercontent.com/${TEST_DRIVER_REPO_OWNER:-grpc}/psm-interop/${TEST_DRIVER_BRANCH:-main}/.kokoro/psm_interop_kokoro_lib.sh" ## xDS test server/client Docker images readonly SERVER_IMAGE_NAME="gcr.io/grpc-testing/xds-interop/cpp-server" readonly CLIENT_IMAGE_NAME="gcr.io/grpc-testing/xds-interop/cpp-client"