From 86fb58f61720e3634f8579588c8d4d1482c61a0a Mon Sep 17 00:00:00 2001 From: MV Shiva Prasad Date: Mon, 1 Jun 2026 22:51:23 +0530 Subject: [PATCH 1/5] buildscripts: add regional td config for psm-interop --- buildscripts/kokoro/psm-regional_td.cfg | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 buildscripts/kokoro/psm-regional_td.cfg diff --git a/buildscripts/kokoro/psm-regional_td.cfg b/buildscripts/kokoro/psm-regional_td.cfg new file mode 100644 index 00000000000..80351d86b94 --- /dev/null +++ b/buildscripts/kokoro/psm-regional_td.cfg @@ -0,0 +1,17 @@ +# Config file for internal CI + +# Location of the continuous shell script in repository. +build_file: "grpc-java/buildscripts/kokoro/psm-interop-test-java.sh" +timeout_mins: 30 + +action { + define_artifacts { + regex: "artifacts/**/*sponge_log.xml" + regex: "artifacts/**/*.log" + strip_prefix: "artifacts" + } +} +env_vars { + key: "PSM_TEST_SUITE" + value: "regional-td" +} From b3b3e1eddc1aa426b2646f15a273a82ec6e09e1a Mon Sep 17 00:00:00 2001 From: MV Shiva Date: Tue, 2 Jun 2026 09:01:52 +0530 Subject: [PATCH 2/5] Rename PSM_TEST_SUITE value from 'regional-td' to 'regional_td' --- buildscripts/kokoro/psm-regional_td.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildscripts/kokoro/psm-regional_td.cfg b/buildscripts/kokoro/psm-regional_td.cfg index 80351d86b94..60c7258e2da 100644 --- a/buildscripts/kokoro/psm-regional_td.cfg +++ b/buildscripts/kokoro/psm-regional_td.cfg @@ -13,5 +13,5 @@ action { } env_vars { key: "PSM_TEST_SUITE" - value: "regional-td" + value: "regional_td" } From d17fe52f1175f2d3f3592e580e32e538683f2c5a Mon Sep 17 00:00:00 2001 From: MV Shiva Prasad Date: Mon, 22 Jun 2026 12:10:07 +0530 Subject: [PATCH 3/5] Upgrade to Protobuf 35.1 --- MODULE.bazel | 2 +- buildscripts/kokoro/windows32.bat | 2 +- buildscripts/kokoro/windows64.bat | 2 +- buildscripts/make_dependencies.bat | 2 +- buildscripts/make_dependencies.sh | 2 +- repositories.bzl | 6 +++--- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index a259cf60080..6e2e0589b62 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -54,7 +54,7 @@ bazel_dep(name = "bazel_jar_jar", version = "0.1.11.bcr.1") bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "googleapis", version = "0.0.0-20260514-1dbb1a14", repo_name = "com_google_googleapis") bazel_dep(name = "grpc-proto", version = "0.0.0-20240627-ec30f58.bcr.1", repo_name = "io_grpc_grpc_proto") -bazel_dep(name = "protobuf", version = "33.4", repo_name = "com_google_protobuf") +bazel_dep(name = "protobuf", version = "35.1", repo_name = "com_google_protobuf") bazel_dep(name = "rules_android", version = "0.7.2") bazel_dep(name = "rules_cc", version = "0.0.9") bazel_dep(name = "rules_java", version = "9.1.0") diff --git a/buildscripts/kokoro/windows32.bat b/buildscripts/kokoro/windows32.bat index d51beba82f9..90c74a57f1a 100644 --- a/buildscripts/kokoro/windows32.bat +++ b/buildscripts/kokoro/windows32.bat @@ -25,7 +25,7 @@ cd "%WORKSPACE%" SET TARGET_ARCH=x86_32 SET FAIL_ON_WARNINGS=true -SET PROTOBUF_VER=33.4 +SET PROTOBUF_VER=35.1 SET PKG_CONFIG_PATH=%ESCWORKSPACE%\\grpc-java-helper32\\protobuf-%PROTOBUF_VER%\\build\\protobuf-%PROTOBUF_VER%\\lib\\pkgconfig SET VC_PROTOBUF_LIBS=/LIBPATH:%ESCWORKSPACE%\\grpc-java-helper32\\protobuf-%PROTOBUF_VER%\\build\\protobuf-%PROTOBUF_VER%\\lib SET VC_PROTOBUF_INCLUDE=%ESCWORKSPACE%\\grpc-java-helper32\\protobuf-%PROTOBUF_VER%\\build\\protobuf-%PROTOBUF_VER%\\include diff --git a/buildscripts/kokoro/windows64.bat b/buildscripts/kokoro/windows64.bat index 180025d5e82..dba07807d03 100644 --- a/buildscripts/kokoro/windows64.bat +++ b/buildscripts/kokoro/windows64.bat @@ -24,7 +24,7 @@ cd "%WORKSPACE%" SET TARGET_ARCH=x86_64 SET FAIL_ON_WARNINGS=true -SET PROTOBUF_VER=33.4 +SET PROTOBUF_VER=35.1 SET PKG_CONFIG_PATH=%ESCWORKSPACE%\\grpc-java-helper64\\protobuf-%PROTOBUF_VER%\\build\\protobuf-%PROTOBUF_VER%\\lib\\pkgconfig SET VC_PROTOBUF_LIBS=/LIBPATH:%ESCWORKSPACE%\\grpc-java-helper64\\protobuf-%PROTOBUF_VER%\\build\\protobuf-%PROTOBUF_VER%\\lib SET VC_PROTOBUF_INCLUDE=%ESCWORKSPACE%\\grpc-java-helper64\\protobuf-%PROTOBUF_VER%\\build\\protobuf-%PROTOBUF_VER%\\include diff --git a/buildscripts/make_dependencies.bat b/buildscripts/make_dependencies.bat index a11f84d998e..4ff775347a5 100644 --- a/buildscripts/make_dependencies.bat +++ b/buildscripts/make_dependencies.bat @@ -1,7 +1,7 @@ choco install -y pkgconfiglite choco install -y openjdk --version=17.0 set PATH=%PATH%;"c:\Program Files\OpenJDK\jdk-17\bin" -set PROTOBUF_VER=33.4 +set PROTOBUF_VER=35.1 set ABSL_VERSION=20250127.1 set CMAKE_NAME=cmake-3.26.3-windows-x86_64 diff --git a/buildscripts/make_dependencies.sh b/buildscripts/make_dependencies.sh index 8cbefddd2eb..600e2d40a1b 100755 --- a/buildscripts/make_dependencies.sh +++ b/buildscripts/make_dependencies.sh @@ -3,7 +3,7 @@ # Build protoc set -evux -o pipefail -PROTOBUF_VERSION=33.4 +PROTOBUF_VERSION=35.1 ABSL_VERSION=20250127.1 # ARCH is x86_64 bit unless otherwise specified. diff --git a/repositories.bzl b/repositories.bzl index 6451625befa..b4753a56202 100644 --- a/repositories.bzl +++ b/repositories.bzl @@ -120,9 +120,9 @@ def com_google_protobuf(): # This statement defines the @com_google_protobuf repo. http_archive( name = "com_google_protobuf", - sha256 = "bc670a4e34992c175137ddda24e76562bb928f849d712a0e3c2fb2e19249bea1", - strip_prefix = "protobuf-33.4", - urls = ["https://github.com/protocolbuffers/protobuf/releases/download/v33.4/protobuf-33.4.tar.gz"], + sha256 = "f0b6838e7522a8da96126d487068c959bc624926368f3024ac8fd03abd0a1ac4", + strip_prefix = "protobuf-35.1", + urls = ["https://github.com/protocolbuffers/protobuf/releases/download/v35.1/protobuf-35.1.tar.gz"], ) def io_grpc_grpc_proto(): From 0163029957a7d0e53d9d9df1a12d261cfa605a32 Mon Sep 17 00:00:00 2001 From: MV Shiva Prasad Date: Mon, 22 Jun 2026 13:55:57 +0530 Subject: [PATCH 4/5] upgrade rules_android to make it compatible --- MODULE.bazel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MODULE.bazel b/MODULE.bazel index 6e2e0589b62..499ef8a86fc 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -55,7 +55,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "googleapis", version = "0.0.0-20260514-1dbb1a14", repo_name = "com_google_googleapis") bazel_dep(name = "grpc-proto", version = "0.0.0-20240627-ec30f58.bcr.1", repo_name = "io_grpc_grpc_proto") bazel_dep(name = "protobuf", version = "35.1", repo_name = "com_google_protobuf") -bazel_dep(name = "rules_android", version = "0.7.2") +bazel_dep(name = "rules_android", version = "0.7.3") bazel_dep(name = "rules_cc", version = "0.0.9") bazel_dep(name = "rules_java", version = "9.1.0") bazel_dep(name = "rules_jvm_external", version = "6.0") From e2c5e49e9e8bb56aeba3a5e010c7cf0d394415a5 Mon Sep 17 00:00:00 2001 From: MV Shiva Prasad Date: Mon, 22 Jun 2026 14:21:24 +0530 Subject: [PATCH 5/5] add rules_proto --- MODULE.bazel | 1 + repositories.bzl | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/MODULE.bazel b/MODULE.bazel index 499ef8a86fc..9f0de3eb789 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -55,6 +55,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "googleapis", version = "0.0.0-20260514-1dbb1a14", repo_name = "com_google_googleapis") bazel_dep(name = "grpc-proto", version = "0.0.0-20240627-ec30f58.bcr.1", repo_name = "io_grpc_grpc_proto") bazel_dep(name = "protobuf", version = "35.1", repo_name = "com_google_protobuf") +bazel_dep(name = "rules_proto", version = "7.1.0") bazel_dep(name = "rules_android", version = "0.7.3") bazel_dep(name = "rules_cc", version = "0.0.9") bazel_dep(name = "rules_java", version = "9.1.0") diff --git a/repositories.bzl b/repositories.bzl index b4753a56202..88434371b2b 100644 --- a/repositories.bzl +++ b/repositories.bzl @@ -104,6 +104,13 @@ def grpc_java_repositories(): "https://github.com/googleapis/googleapis/archive/1dbb1a14e079f78d9214f8e48bf083f32e3ddb96.tar.gz", ], ) + if not native.existing_rule("rules_proto"): + http_archive( + name = "rules_proto", + sha256 = "14a225870ab4e91869652cfd69ef2028277fc1dc4910d65d353b62d6e0ae21f4", + strip_prefix = "rules_proto-7.1.0", + urls = ["https://github.com/bazelbuild/rules_proto/releases/download/7.1.0/rules_proto-7.1.0.tar.gz"], + ) if not native.existing_rule("io_grpc_grpc_proto"): io_grpc_grpc_proto() if not native.existing_rule("bazel_jar_jar"):