Sync from Piper @473817856

PROTOBUF_SYNC_PIPER

CHANGES.txt

@@ -12,6 +12,15 @@
   * Use table-driven parser for reflection based objects.
   * Update Map's InternalSwap() to take a pointer to the other Map.
   * Add ARM-optimized Varint decoding functions.
+  * Minor optimization for parsing groups
+  * Declare ReflectiveProtoHook class
+  * Reduce size of VarintParse code in protocol buffers, by calling the shared
+    routine after handling just one-byte varint encoding inline, rather than
+    handling one-byte and two-byte varints inline.
+  * Avoid inlining some large heavily duplicated routines in repeated_ptr_field.h
+  * Add ReflectiveProtoHook to Reflection.
+  * Turns on table-driven parser for reflection based objects.
+
 
   Kotlin
   * Suppress deprecation warnings in Kotlin generated code.

kokoro/linux/32-bit/common.cfg

@@ -0,0 +1,11 @@
+# Config file for running tests in Kokoro
+
+# Location of the build script in repository
+build_file: "protobuf/kokoro/linux/32-bit/build.sh"
+timeout_mins: 120
+
+action {
+  define_artifacts {
+    regex: "**/sponge_log.xml"
+  }
+}

kokoro/linux/32-bit/continuous.cfg

@@ -1,11 +1 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/32-bit/build.sh"
-timeout_mins: 120
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.xml"
-  }
-}
+# Keep this file empty! Use common.cfg instead.

kokoro/linux/32-bit/presubmit.cfg

@@ -1,11 +1 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/32-bit/build.sh"
-timeout_mins: 120
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.xml"
-  }
-}
+# Keep this file empty! Use common.cfg instead.

kokoro/linux/bazel/common.cfg

@@ -0,0 +1,16 @@
+# Default setup for the all of our Kokoro builds.
+
+# Location of the build script in repository
+build_file: "protobuf/kokoro/linux/bazel.sh"
+timeout_mins: 15
+
+env_vars {
+  key: "BAZEL_TARGETS"
+  value: "//src/..."
+}
+
+action {
+  define_artifacts {
+    regex: "**/sponge_log.*"
+  }
+}

kokoro/linux/bazel/continuous.cfg

@@ -1,16 +1 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/bazel.sh"
-timeout_mins: 15
-
-env_vars {
-  key: "BAZEL_TARGETS"
-  value: "//src/..."
-}
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.*"
-  }
-}
+# Keep this file empty! Use common.cfg instead.

kokoro/linux/bazel/presubmit.cfg

@@ -1,16 +1 @@
-# Config file for running C++ Bazel tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/bazel.sh"
-timeout_mins: 15
-
-env_vars {
-  key: "BAZEL_TARGETS"
-  value: "//src/..."
-}
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.*"
-  }
-}
+# Keep this file empty! Use common.cfg instead.

kokoro/linux/cmake/common.cfg

@@ -0,0 +1,11 @@
+# Config file for running tests in Kokoro
+
+# Location of the build script in repository
+build_file: "protobuf/kokoro/linux/cmake/build.sh"
+timeout_mins: 1440
+
+action {
+  define_artifacts {
+    regex: "**/sponge_log.*"
+  }
+}

kokoro/linux/cmake/continuous.cfg

@@ -1,11 +1 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/cmake/build.sh"
-timeout_mins: 1440
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.*"
-  }
-}
+# Keep this file empty! Use common.cfg instead.

kokoro/linux/cmake/presubmit.cfg

@@ -1,11 +1 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/cmake/build.sh"
-timeout_mins: 1440
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.*"
-  }
-}
+# Keep this file empty! Use common.cfg instead.

kokoro/linux/cmake_install/common.cfg

@@ -0,0 +1,11 @@
+# Config file for running tests in Kokoro
+
+# Location of the build script in repository
+build_file: "protobuf/kokoro/linux/cmake_install/build.sh"
+timeout_mins: 1440
+
+action {
+  define_artifacts {
+    regex: "**/sponge_log.*"
+  }
+}

kokoro/linux/cmake_install/continuous.cfg

@@ -1,11 +1 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/cmake_install/build.sh"
-timeout_mins: 1440
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.*"
-  }
-}
+# Keep this file empty! Use common.cfg instead.

kokoro/linux/cmake_install/presubmit.cfg

@@ -1,11 +1 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/cmake_install/build.sh"
-timeout_mins: 1440
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.*"
-  }
-}
+# Keep this file empty! Use common.cfg instead.

kokoro/linux/cmake_ninja/common.cfg

@@ -0,0 +1,11 @@
+# Config file for running tests in Kokoro
+
+# Location of the build script in repository
+build_file: "protobuf/kokoro/linux/cmake_ninja/build.sh"
+timeout_mins: 1440
+
+action {
+  define_artifacts {
+    regex: "**/sponge_log.*"
+  }
+}

kokoro/linux/cmake_ninja/continuous.cfg

@@ -1,11 +1 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/cmake_ninja/build.sh"
-timeout_mins: 1440
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.*"
-  }
-}
+# Keep this file empty! Use common.cfg instead.

kokoro/linux/cmake_ninja/presubmit.cfg

@@ -1,11 +1 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/cmake_ninja/build.sh"
-timeout_mins: 1440
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.*"
-  }
-}
+# Keep this file empty! Use common.cfg instead.

kokoro/linux/cmake_shared/common.cfg

@@ -0,0 +1,11 @@
+# Config file for running tests in Kokoro
+
+# Location of the build script in repository
+build_file: "protobuf/kokoro/linux/cmake/build.sh"
+timeout_mins: 1440
+
+action {
+  define_artifacts {
+    regex: "**/sponge_log.*"
+  }
+}

kokoro/linux/cmake_shared/continuous.cfg

@@ -1,11 +1 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/cmake/build.sh"
-timeout_mins: 1440
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.*"
-  }
-}
+# Keep this file empty! Use common.cfg instead.

kokoro/linux/cmake_shared/presubmit.cfg

@@ -1,11 +1 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/cmake/build.sh"
-timeout_mins: 1440
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.*"
-  }
-}
+# Keep this file empty! Use common.cfg instead.

kokoro/linux/cpp_aarch64/common.cfg

@@ -0,0 +1,21 @@
+# Config file for running tests in Kokoro
+
+# Location of the build script in repository
+build_file: "protobuf/kokoro/linux/bazel.sh"
+timeout_mins: 120
+
+env_vars {
+  key: "CONTAINER_IMAGE"
+  value: "gcr.io/protobuf-build/emulation/linux:aarch64-4e847d7a01c1792471b6dd985ab0bf2677332e6f"
+}
+
+env_vars {
+  key: "BAZEL_TARGETS"
+  value: "//src/..."
+}
+
+action {
+  define_artifacts {
+    regex: "**/sponge_log.*"
+  }
+}

kokoro/linux/cpp_aarch64/continuous.cfg

@@ -1,21 +1 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/bazel.sh"
-timeout_mins: 120
-
-env_vars {
-  key: "CONTAINER_IMAGE"
-  value: "gcr.io/protobuf-build/emulation/linux:aarch64-4e847d7a01c1792471b6dd985ab0bf2677332e6f"
-}
-
-env_vars {
-  key: "BAZEL_TARGETS"
-  value: "//src/..."
-}
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.*"
-  }
-}
+# Keep this file empty! Use common.cfg instead.

kokoro/linux/cpp_aarch64/presubmit.cfg

@@ -1,21 +1 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/bazel.sh"
-timeout_mins: 120
-
-env_vars {
-  key: "CONTAINER_IMAGE"
-  value: "gcr.io/protobuf-build/emulation/linux:aarch64-4e847d7a01c1792471b6dd985ab0bf2677332e6f"
-}
-
-env_vars {
-  key: "BAZEL_TARGETS"
-  value: "//src/..."
-}
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.*"
-  }
-}
+# Keep this file empty! Use common.cfg instead.

kokoro/linux/cpp_tcmalloc/common.cfg

@@ -0,0 +1,21 @@
+# Config file for running tests in Kokoro
+
+# Location of the build script in repository
+build_file: "protobuf/kokoro/linux/bazel.sh"
+timeout_mins: 1440
+
+env_vars {
+  key: "CONTAINER_IMAGE"
+  value: "gcr.io/protobuf-build/tcmalloc/linux:64e8944e4f18d7d6c9649112a8a93be57e693cd8"
+}
+
+env_vars {
+  key: "BAZEL_TARGETS"
+  value: "//src/..."
+}
+
+action {
+  define_artifacts {
+    regex: "**/sponge_log.*"
+  }
+}

kokoro/linux/cpp_tcmalloc/continuous.cfg

@@ -1,21 +1 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/bazel.sh"
-timeout_mins: 1440
-
-env_vars {
-  key: "CONTAINER_IMAGE"
-  value: "gcr.io/protobuf-build/tcmalloc/linux:64e8944e4f18d7d6c9649112a8a93be57e693cd8"
-}
-
-env_vars {
-  key: "BAZEL_TARGETS"
-  value: "//src/..."
-}
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.*"
-  }
-}
+# Keep this file empty! Use common.cfg instead.

kokoro/linux/cpp_tcmalloc/presubmit.cfg

@@ -1,21 +1 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/bazel.sh"
-timeout_mins: 1440
-
-env_vars {
-  key: "CONTAINER_IMAGE"
-  value: "gcr.io/protobuf-build/tcmalloc/linux:64e8944e4f18d7d6c9649112a8a93be57e693cd8"
-}
-
-env_vars {
-  key: "BAZEL_TARGETS"
-  value: "//src/..."
-}
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.*"
-  }
-}
+# Keep this file empty! Use common.cfg instead.

kokoro/linux/csharp/common.cfg

@@ -0,0 +1,27 @@
+# Config file for running tests in Kokoro
+
+# Location of the build script in repository
+build_file: "protobuf/kokoro/linux/bazel.sh"
+timeout_mins: 1440
+
+env_vars {
+  key: "CONTAINER_IMAGE"
+  value: "gcr.io/protobuf-build/csharp/linux:3.1.415-6.0.100-6bbe70439ba5b0404bb12662cebc0296909389fa"
+}
+
+env_vars {
+  key: "BAZEL_TARGETS"
+  value: "//csharp/..."
+}
+
+env_vars {
+  key: "BAZEL_EXTRA_FLAGS"
+  value: "--action_env=DOTNET_CLI_TELEMETRY_OPTOUT=1 "
+         "--test_env=DOTNET_CLI_HOME=/home/bazel"
+}
+
+action {
+  define_artifacts {
+    regex: "**/sponge_log.*"
+  }
+}

kokoro/linux/csharp/continuous.cfg

@@ -1,27 +1 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/bazel.sh"
-timeout_mins: 1440
-
-env_vars {
-  key: "CONTAINER_IMAGE"
-  value: "gcr.io/protobuf-build/csharp/linux:3.1.415-6.0.100-6bbe70439ba5b0404bb12662cebc0296909389fa"
-}
-
-env_vars {
-  key: "BAZEL_TARGETS"
-  value: "//csharp/..."
-}
-
-env_vars {
-  key: "BAZEL_EXTRA_FLAGS"
-  value: "--action_env=DOTNET_CLI_TELEMETRY_OPTOUT=1 "
-         "--test_env=DOTNET_CLI_HOME=/home/bazel"
-}
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.*"
-  }
-}
+# Keep this file empty! Use common.cfg instead.

kokoro/linux/csharp/presubmit.cfg

@@ -1,27 +1 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/bazel.sh"
-timeout_mins: 1440
-
-env_vars {
-  key: "CONTAINER_IMAGE"
-  value: "gcr.io/protobuf-build/csharp/linux:3.1.415-6.0.100-6bbe70439ba5b0404bb12662cebc0296909389fa"
-}
-
-env_vars {
-  key: "BAZEL_TARGETS"
-  value: "//csharp/..."
-}
-
-env_vars {
-  key: "BAZEL_EXTRA_FLAGS"
-  value: "--action_env=DOTNET_CLI_TELEMETRY_OPTOUT=1 "
-         "--test_env=DOTNET_CLI_HOME=/home/bazel"
-}
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.*"
-  }
-}
+# Keep this file empty! Use common.cfg instead.

kokoro/linux/csharp_aarch64/common.cfg

@@ -0,0 +1,11 @@
+# Config file for running tests in Kokoro
+
+# Location of the build script in repository
+build_file: "protobuf/kokoro/linux/csharp_aarch64/build.sh"
+timeout_mins: 120
+
+action {
+  define_artifacts {
+    regex: "**/sponge_log.xml"
+  }
+}

kokoro/linux/csharp_aarch64/continuous.cfg

@@ -1,11 +1 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/csharp_aarch64/build.sh"
-timeout_mins: 120
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.xml"
-  }
-}
+# Keep this file empty! Use common.cfg instead.

kokoro/linux/csharp_aarch64/presubmit.cfg

@@ -1,11 +1 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/csharp_aarch64/build.sh"
-timeout_mins: 120
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.xml"
-  }
-}
+# Keep this file empty! Use common.cfg instead.

kokoro/linux/java_aarch64/common.cfg

@@ -0,0 +1,21 @@
+# Config file for running tests in Kokoro
+
+# Location of the build script in repository
+build_file: "protobuf/kokoro/linux/bazel.sh"
+timeout_mins: 120
+
+env_vars {
+  key: "CONTAINER_IMAGE"
+  value: "gcr.io/protobuf-build/emulation/linux:aarch64-4e847d7a01c1792471b6dd985ab0bf2677332e6f"
+}
+
+env_vars {
+  key: "BAZEL_TARGETS"
+  value: "//java/..."
+}
+
+action {
+  define_artifacts {
+    regex: "**/sponge_log.*"
+  }
+}

kokoro/linux/java_aarch64/continuous.cfg

@@ -1,21 +1 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/bazel.sh"
-timeout_mins: 120
-
-env_vars {
-  key: "CONTAINER_IMAGE"
-  value: "gcr.io/protobuf-build/emulation/linux:aarch64-4e847d7a01c1792471b6dd985ab0bf2677332e6f"
-}
-
-env_vars {
-  key: "BAZEL_TARGETS"
-  value: "//java/..."
-}
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.*"
-  }
-}
+# Keep this file empty! Use common.cfg instead.

kokoro/linux/java_aarch64/presubmit.cfg

@@ -1,20 +1 @@
-# Config file for running tests in Kokoro
-
-build_file: "protobuf/kokoro/linux/bazel.sh"
-timeout_mins: 120
-
-env_vars {
-  key: "CONTAINER_IMAGE"
-  value: "gcr.io/protobuf-build/emulation/linux:aarch64-4e847d7a01c1792471b6dd985ab0bf2677332e6f"
-}
-
-env_vars {
-  key: "BAZEL_TARGETS"
-  value: "//java/..."
-}
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.*"
-  }
-}
+# Keep this file empty! Use common.cfg instead.

kokoro/linux/java_jdk11/common.cfg

@@ -0,0 +1,16 @@
+# Config file for running tests in Kokoro
+
+# Location of the build script in repository
+build_file: "protobuf/kokoro/linux/bazel.sh"
+timeout_mins: 120
+
+env_vars {
+  key: "BAZEL_TARGETS"
+  value: "//java/..."
+}
+
+action {
+  define_artifacts {
+    regex: "**/sponge_log.*"
+  }
+}

kokoro/linux/java_jdk11/continuous.cfg

@@ -1,16 +1 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/bazel.sh"
-timeout_mins: 120
-
-env_vars {
-  key: "BAZEL_TARGETS"
-  value: "//java/..."
-}
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.*"
-  }
-}
+# Keep this file empty! Use common.cfg instead.

kokoro/linux/java_jdk11/presubmit.cfg

@@ -1,16 +1 @@
-# Config file for running Linkage Monitor in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/bazel.sh"
-timeout_mins: 120
-
-env_vars {
-  key: "BAZEL_TARGETS"
-  value: "//java/..."
-}
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.*"
-  }
-}
+# Keep this file empty! Use common.cfg instead.

kokoro/linux/java_jdk17/common.cfg

@@ -0,0 +1,21 @@
+# Config file for running tests in Kokoro
+
+# Location of the build script in repository
+build_file: "protobuf/kokoro/linux/bazel.sh"
+timeout_mins: 120
+
+env_vars {
+  key: "CONTAINER_IMAGE"
+  value: "gcr.io/protobuf-build/java/linux:17-64e8944e4f18d7d6c9649112a8a93be57e693cd8"
+}
+
+env_vars {
+  key: "BAZEL_TARGETS"
+  value: "//java/..."
+}
+
+action {
+  define_artifacts {
+    regex: "**/sponge_log.*"
+  }
+}

kokoro/linux/java_jdk17/continuous.cfg

@@ -1,21 +1 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/bazel.sh"
-timeout_mins: 120
-
-env_vars {
-  key: "CONTAINER_IMAGE"
-  value: "gcr.io/protobuf-build/java/linux:17-64e8944e4f18d7d6c9649112a8a93be57e693cd8"
-}
-
-env_vars {
-  key: "BAZEL_TARGETS"
-  value: "//java/..."
-}
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.*"
-  }
-}
+# Keep this file empty! Use common.cfg instead.

kokoro/linux/java_jdk17/presubmit.cfg

@@ -1,21 +1 @@
-# Config file for running Linkage Monitor in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/bazel.sh"
-timeout_mins: 120
-
-env_vars {
-  key: "CONTAINER_IMAGE"
-  value: "gcr.io/protobuf-build/java/linux:17-64e8944e4f18d7d6c9649112a8a93be57e693cd8"
-}
-
-env_vars {
-  key: "BAZEL_TARGETS"
-  value: "//java/..."
-}
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.*"
-  }
-}
+# Keep this file empty! Use common.cfg instead.

kokoro/linux/java_linkage_monitor/common.cfg

@@ -0,0 +1,12 @@
+# Config file for running Linkage Monitor in Kokoro
+# https://github.com/GoogleCloudPlatform/cloud-opensource-java/tree/master/linkage-monitor
+
+# Location of the build script in repository
+build_file: "protobuf/kokoro/linux/java_linkage_monitor/build.sh"
+timeout_mins: 120
+
+action {
+  define_artifacts {
+    regex: "**/sponge_log.xml"
+  }
+}

kokoro/linux/java_linkage_monitor/continuous.cfg

@@ -1,11 +1 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/java_linkage_monitor/build.sh"
-timeout_mins: 120
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.xml"
-  }
-}
+# Keep this file empty! Use common.cfg instead.

kokoro/linux/java_linkage_monitor/presubmit.cfg

@@ -1,12 +1 @@
-# Config file for running Linkage Monitor in Kokoro
-# https://github.com/GoogleCloudPlatform/cloud-opensource-java/tree/master/linkage-monitor
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/java_linkage_monitor/build.sh"
-timeout_mins: 120
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.xml"
-  }
-}
+# Keep this file empty! Use common.cfg instead.

kokoro/linux/jruby92/common.cfg

@@ -0,0 +1,26 @@
+# Config file for running tests in Kokoro
+
+# Location of the build script in repository
+build_file: "protobuf/kokoro/linux/bazel.sh"
+timeout_mins: 120
+
+env_vars {
+  key: "CONTAINER_IMAGE"
+  value: "gcr.io/protobuf-build/ruby/linux:jruby-9.2.20.1-64e8944e4f18d7d6c9649112a8a93be57e693cd8"
+}
+
+env_vars {
+  key: "BAZEL_TARGETS"
+  value: "//ruby/..."
+}
+
+env_vars {
+  key: "BAZEL_EXTRA_FLAGS"
+  value: "--define=ruby_platform=java"
+}
+
+action {
+  define_artifacts {
+    regex: "**/sponge_log.*"
+  }
+}

kokoro/linux/jruby92/continuous.cfg

@@ -1,26 +1 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/bazel.sh"
-timeout_mins: 120
-
-env_vars {
-  key: "CONTAINER_IMAGE"
-  value: "gcr.io/protobuf-build/ruby/linux:jruby-9.2.20.1-64e8944e4f18d7d6c9649112a8a93be57e693cd8"
-}
-
-env_vars {
-  key: "BAZEL_TARGETS"
-  value: "//ruby/..."
-}
-
-env_vars {
-  key: "BAZEL_EXTRA_FLAGS"
-  value: "--define=ruby_platform=java"
-}
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.*"
-  }
-}
+# Keep this file empty! Use common.cfg instead.

kokoro/linux/jruby92/presubmit.cfg

@@ -1,26 +1 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/bazel.sh"
-timeout_mins: 120
-
-env_vars {
-  key: "CONTAINER_IMAGE"
-  value: "gcr.io/protobuf-build/ruby/linux:jruby-9.2.20.1-64e8944e4f18d7d6c9649112a8a93be57e693cd8"
-}
-
-env_vars {
-  key: "BAZEL_TARGETS"
-  value: "//ruby/..."
-}
-
-env_vars {
-  key: "BAZEL_EXTRA_FLAGS"
-  value: "--define=ruby_platform=java"
-}
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.*"
-  }
-}
+# Keep this file empty! Use common.cfg instead.

kokoro/linux/jruby93/common.cfg

@@ -0,0 +1,26 @@
+# Config file for running tests in Kokoro
+
+# Location of the build script in repository
+build_file: "protobuf/kokoro/linux/bazel.sh"
+timeout_mins: 120
+
+env_vars {
+  key: "CONTAINER_IMAGE"
+  value: "gcr.io/protobuf-build/ruby/linux:jruby-9.3.4.0-64e8944e4f18d7d6c9649112a8a93be57e693cd8"
+}
+
+env_vars {
+  key: "BAZEL_TARGETS"
+  value: "//ruby/..."
+}
+
+env_vars {
+  key: "BAZEL_EXTRA_FLAGS"
+  value: "--define=ruby_platform=java"
+}
+
+action {
+  define_artifacts {
+    regex: "**/sponge_log.*"
+  }
+}

kokoro/linux/jruby93/continuous.cfg

@@ -1,26 +1 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/bazel.sh"
-timeout_mins: 120
-
-env_vars {
-  key: "CONTAINER_IMAGE"
-  value: "gcr.io/protobuf-build/ruby/linux:jruby-9.3.4.0-64e8944e4f18d7d6c9649112a8a93be57e693cd8"
-}
-
-env_vars {
-  key: "BAZEL_TARGETS"
-  value: "//ruby/..."
-}
-
-env_vars {
-  key: "BAZEL_EXTRA_FLAGS"
-  value: "--define=ruby_platform=java"
-}
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.*"
-  }
-}
+# Keep this file empty! Use common.cfg instead.

kokoro/linux/jruby93/presubmit.cfg

@@ -1,26 +1 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/bazel.sh"
-timeout_mins: 120
-
-env_vars {
-  key: "CONTAINER_IMAGE"
-  value: "gcr.io/protobuf-build/ruby/linux:jruby-9.3.4.0-64e8944e4f18d7d6c9649112a8a93be57e693cd8"
-}
-
-env_vars {
-  key: "BAZEL_TARGETS"
-  value: "//ruby/..."
-}
-
-env_vars {
-  key: "BAZEL_EXTRA_FLAGS"
-  value: "--define=ruby_platform=java"
-}
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.*"
-  }
-}
+# Keep this file empty! Use common.cfg instead.

kokoro/linux/php_aarch64/common.cfg

@@ -0,0 +1,11 @@
+# Config file for running tests in Kokoro
+
+# Location of the build script in repository
+build_file: "protobuf/kokoro/linux/php_aarch64/build.sh"
+timeout_mins: 120
+
+action {
+  define_artifacts {
+    regex: "**/sponge_log.xml"
+  }
+}

kokoro/linux/php_aarch64/continuous.cfg

@@ -1,11 +1 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/php_aarch64/build.sh"
-timeout_mins: 120
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.xml"
-  }
-}
+# Keep this file empty! Use common.cfg instead.

kokoro/linux/php_aarch64/presubmit.cfg

@@ -1,11 +1 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/php_aarch64/build.sh"
-timeout_mins: 120
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.xml"
-  }
-}
+# Keep this file empty! Use common.cfg instead.

kokoro/linux/php_all/common.cfg

@@ -0,0 +1,11 @@
+# Config file for running tests in Kokoro
+
+# Location of the build script in repository
+build_file: "protobuf/kokoro/linux/php_all/build.sh"
+timeout_mins: 120
+
+action {
+  define_artifacts {
+    regex: "**/sponge_log.xml"
+  }
+}

kokoro/linux/php_all/continuous.cfg

@@ -1,11 +1 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/php_all/build.sh"
-timeout_mins: 120
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.xml"
-  }
-}
+# Keep this file empty! Use common.cfg instead.

kokoro/linux/php_all/presubmit.cfg

@@ -1,11 +1 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/php_all/build.sh"
-timeout_mins: 120
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.xml"
-  }
-}
+# Keep this file empty! Use common.cfg instead.

kokoro/linux/python310/common.cfg

@@ -0,0 +1,21 @@
+# Config file for running tests in Kokoro
+
+# Location of the build script in repository
+build_file: "protobuf/kokoro/linux/bazel.sh"
+timeout_mins: 120
+
+env_vars {
+  key: "CONTAINER_IMAGE"
+  value: "gcr.io/protobuf-build/python/linux:3.10-2f706fd1ab49f4e97af769388be486069b63efee"
+}
+
+env_vars {
+  key: "BAZEL_TARGETS"
+  value: "//python/... @upb//python/..."
+}
+
+action {
+  define_artifacts {
+    regex: "**/sponge_log.*"
+  }
+}

kokoro/linux/python310/continuous.cfg

@@ -1,21 +1 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/bazel.sh"
-timeout_mins: 120
-
-env_vars {
-  key: "CONTAINER_IMAGE"
-  value: "gcr.io/protobuf-build/python/linux:3.10-2f706fd1ab49f4e97af769388be486069b63efee"
-}
-
-env_vars {
-  key: "BAZEL_TARGETS"
-  value: "//python/... @upb//python/..."
-}
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.*"
-  }
-}
+# Keep this file empty! Use common.cfg instead.

kokoro/linux/python310/presubmit.cfg

@@ -1,21 +1 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/bazel.sh"
-timeout_mins: 120
-
-env_vars {
-  key: "CONTAINER_IMAGE"
-  value: "gcr.io/protobuf-build/python/linux:3.10-2f706fd1ab49f4e97af769388be486069b63efee"
-}
-
-env_vars {
-  key: "BAZEL_TARGETS"
-  value: "//python/... @upb//python/..."
-}
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.*"
-  }
-}
+# Keep this file empty! Use common.cfg instead.

kokoro/linux/python310_cpp/common.cfg

@@ -0,0 +1,27 @@
+# Config file for running tests in Kokoro
+
+# Location of the build script in repository
+build_file: "protobuf/kokoro/linux/bazel.sh"
+timeout_mins: 120
+
+env_vars {
+  key: "CONTAINER_IMAGE"
+  value: "gcr.io/protobuf-build/python/linux:3.10-2f706fd1ab49f4e97af769388be486069b63efee"
+}
+
+env_vars {
+  key: "BAZEL_TARGETS"
+  # Note: upb tests don't work since the C++ extension takes precedence here.
+  value: "//python/..."
+}
+
+env_vars {
+  key: "BAZEL_EXTRA_FLAGS"
+  value: "--define=use_fast_cpp_protos=true"
+}
+
+action {
+  define_artifacts {
+    regex: "**/sponge_log.*"
+  }
+}

kokoro/linux/python310_cpp/continuous.cfg

@@ -1,28 +1 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/bazel.sh"
-timeout_mins: 120
-
-env_vars {
-  key: "CONTAINER_IMAGE"
-  value: "gcr.io/protobuf-build/python/linux:3.10-2f706fd1ab49f4e97af769388be486069b63efee"
-}
-
-env_vars {
-  key: "BAZEL_TARGETS"
-  # Note: upb tests don't work since the C++ extension takes precedence here.
-  # Note: upb tests don't work since the C++ extension takes precedence here.
-  value: "//python/..."
-}
-
-env_vars {
-  key: "BAZEL_EXTRA_FLAGS"
-  value: "--define=use_fast_cpp_protos=true"
-}
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.*"
-  }
-}
+# Keep this file empty! Use common.cfg instead.

kokoro/linux/python310_cpp/presubmit.cfg

@@ -1,27 +1 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/bazel.sh"
-timeout_mins: 120
-
-env_vars {
-  key: "CONTAINER_IMAGE"
-  value: "gcr.io/protobuf-build/python/linux:3.10-2f706fd1ab49f4e97af769388be486069b63efee"
-}
-
-env_vars {
-  key: "BAZEL_TARGETS"
-  # Note: upb tests don't work since the C++ extension takes precedence here.
-  value: "//python/..."
-}
-
-env_vars {
-  key: "BAZEL_EXTRA_FLAGS"
-  value: "--define=use_fast_cpp_protos=true"
-}
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.*"
-  }
-}
+# Keep this file empty! Use common.cfg instead.

kokoro/linux/python37/common.cfg

@@ -0,0 +1,21 @@
+# Config file for running tests in Kokoro
+
+# Location of the build script in repository
+build_file: "protobuf/kokoro/linux/bazel.sh"
+timeout_mins: 120
+
+env_vars {
+  key: "CONTAINER_IMAGE"
+  value: "gcr.io/protobuf-build/python/linux:3.7-2f706fd1ab49f4e97af769388be486069b63efee"
+}
+
+env_vars {
+  key: "BAZEL_TARGETS"
+  value: "//python/... @upb//python/..."
+}
+
+action {
+  define_artifacts {
+    regex: "**/sponge_log.*"
+  }
+}

kokoro/linux/python37/continuous.cfg

@@ -1,21 +1 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/bazel.sh"
-timeout_mins: 120
-
-env_vars {
-  key: "CONTAINER_IMAGE"
-  value: "gcr.io/protobuf-build/python/linux:3.7-2f706fd1ab49f4e97af769388be486069b63efee"
-}
-
-env_vars {
-  key: "BAZEL_TARGETS"
-  value: "//python/... @upb//python/..."
-}
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.*"
-  }
-}
+# Keep this file empty! Use common.cfg instead.

kokoro/linux/python37/presubmit.cfg

@@ -1,21 +1 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/bazel.sh"
-timeout_mins: 120
-
-env_vars {
-  key: "CONTAINER_IMAGE"
-  value: "gcr.io/protobuf-build/python/linux:3.7-2f706fd1ab49f4e97af769388be486069b63efee"
-}
-
-env_vars {
-  key: "BAZEL_TARGETS"
-  value: "//python/... @upb//python/..."
-}
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.*"
-  }
-}
+# Keep this file empty! Use common.cfg instead.

kokoro/linux/python37_cpp/common.cfg

@@ -0,0 +1,27 @@
+# Config file for running tests in Kokoro
+
+# Location of the build script in repository
+build_file: "protobuf/kokoro/linux/bazel.sh"
+timeout_mins: 120
+
+env_vars {
+  key: "CONTAINER_IMAGE"
+  value: "gcr.io/protobuf-build/python/linux:3.7-2f706fd1ab49f4e97af769388be486069b63efee"
+}
+
+env_vars {
+  key: "BAZEL_TARGETS"
+  # Note: upb tests don't work since the C++ extension takes precedence here.
+  value: "//python/..."
+}
+
+env_vars {
+  key: "BAZEL_EXTRA_FLAGS"
+  value: "--define=use_fast_cpp_protos=true"
+}
+
+action {
+  define_artifacts {
+    regex: "**/sponge_log.*"
+  }
+}

kokoro/linux/python37_cpp/continuous.cfg

@@ -1,27 +1 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/bazel.sh"
-timeout_mins: 120
-
-env_vars {
-  key: "CONTAINER_IMAGE"
-  value: "gcr.io/protobuf-build/python/linux:3.7-2f706fd1ab49f4e97af769388be486069b63efee"
-}
-
-env_vars {
-  key: "BAZEL_TARGETS"
-  # Note: upb tests don't work since the C++ extension takes precedence here.
-  value: "//python/..."
-}
-
-env_vars {
-  key: "BAZEL_EXTRA_FLAGS"
-  value: "--define=use_fast_cpp_protos=true"
-}
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.*"
-  }
-}
+# Keep this file empty! Use common.cfg instead.

kokoro/linux/python37_cpp/presubmit.cfg

@@ -1,27 +1 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/bazel.sh"
-timeout_mins: 120
-
-env_vars {
-  key: "CONTAINER_IMAGE"
-  value: "gcr.io/protobuf-build/python/linux:3.7-2f706fd1ab49f4e97af769388be486069b63efee"
-}
-
-env_vars {
-  key: "BAZEL_TARGETS"
-  # Note: upb tests don't work since the C++ extension takes precedence here.
-  value: "//python/..."
-}
-
-env_vars {
-  key: "BAZEL_EXTRA_FLAGS"
-  value: "--define=use_fast_cpp_protos=true"
-}
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.*"
-  }
-}
+# Keep this file empty! Use common.cfg instead.

kokoro/linux/python38/common.cfg

@@ -0,0 +1,21 @@
+# Config file for running tests in Kokoro
+
+# Location of the build script in repository
+build_file: "protobuf/kokoro/linux/bazel.sh"
+timeout_mins: 120
+
+env_vars {
+  key: "CONTAINER_IMAGE"
+  value: "gcr.io/protobuf-build/python/linux:3.8-2f706fd1ab49f4e97af769388be486069b63efee"
+}
+
+env_vars {
+  key: "BAZEL_TARGETS"
+  value: "//python/... @upb//python/..."
+}
+
+action {
+  define_artifacts {
+    regex: "**/sponge_log.*"
+  }
+}

kokoro/linux/python38/continuous.cfg

@@ -1,21 +1 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/bazel.sh"
-timeout_mins: 120
-
-env_vars {
-  key: "CONTAINER_IMAGE"
-  value: "gcr.io/protobuf-build/python/linux:3.8-2f706fd1ab49f4e97af769388be486069b63efee"
-}
-
-env_vars {
-  key: "BAZEL_TARGETS"
-  value: "//python/... @upb//python/..."
-}
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.*"
-  }
-}
+# Keep this file empty! Use common.cfg instead.

kokoro/linux/python38/presubmit.cfg

@@ -1,21 +1 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/bazel.sh"
-timeout_mins: 120
-
-env_vars {
-  key: "CONTAINER_IMAGE"
-  value: "gcr.io/protobuf-build/python/linux:3.8-2f706fd1ab49f4e97af769388be486069b63efee"
-}
-
-env_vars {
-  key: "BAZEL_TARGETS"
-  value: "//python/... @upb//python/..."
-}
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.*"
-  }
-}
+# Keep this file empty! Use common.cfg instead.

kokoro/linux/python38_cpp/common.cfg

@@ -0,0 +1,27 @@
+# Config file for running tests in Kokoro
+
+# Location of the build script in repository
+build_file: "protobuf/kokoro/linux/bazel.sh"
+timeout_mins: 120
+
+env_vars {
+  key: "CONTAINER_IMAGE"
+  value: "gcr.io/protobuf-build/python/linux:3.8-2f706fd1ab49f4e97af769388be486069b63efee"
+}
+
+env_vars {
+  key: "BAZEL_TARGETS"
+  # Note: upb tests don't work since the C++ extension takes precedence here.
+  value: "//python/..."
+}
+
+env_vars {
+  key: "BAZEL_EXTRA_FLAGS"
+  value: "--define=use_fast_cpp_protos=true"
+}
+
+action {
+  define_artifacts {
+    regex: "**/sponge_log.*"
+  }
+}

kokoro/linux/python38_cpp/continuous.cfg

@@ -1,27 +1 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/bazel.sh"
-timeout_mins: 120
-
-env_vars {
-  key: "CONTAINER_IMAGE"
-  value: "gcr.io/protobuf-build/python/linux:3.8-2f706fd1ab49f4e97af769388be486069b63efee"
-}
-
-env_vars {
-  key: "BAZEL_TARGETS"
-  # Note: upb tests don't work since the C++ extension takes precedence here.
-  value: "//python/..."
-}
-
-env_vars {
-  key: "BAZEL_EXTRA_FLAGS"
-  value: "--define=use_fast_cpp_protos=true"
-}
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.*"
-  }
-}
+# Keep this file empty! Use common.cfg instead.

kokoro/linux/python38_cpp/presubmit.cfg

@@ -1,27 +1 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/bazel.sh"
-timeout_mins: 120
-
-env_vars {
-  key: "CONTAINER_IMAGE"
-  value: "gcr.io/protobuf-build/python/linux:3.8-2f706fd1ab49f4e97af769388be486069b63efee"
-}
-
-env_vars {
-  key: "BAZEL_TARGETS"
-  # Note: upb tests don't work since the C++ extension takes precedence here.
-  value: "//python/..."
-}
-
-env_vars {
-  key: "BAZEL_EXTRA_FLAGS"
-  value: "--define=use_fast_cpp_protos=true"
-}
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.*"
-  }
-}
+# Keep this file empty! Use common.cfg instead.

kokoro/linux/python39/common.cfg

@@ -0,0 +1,21 @@
+# Config file for running tests in Kokoro
+
+# Location of the build script in repository
+build_file: "protobuf/kokoro/linux/bazel.sh"
+timeout_mins: 120
+
+env_vars {
+  key: "CONTAINER_IMAGE"
+  value: "gcr.io/protobuf-build/python/linux:3.9-2f706fd1ab49f4e97af769388be486069b63efee"
+}
+
+env_vars {
+  key: "BAZEL_TARGETS"
+  value: "//python/... @upb//python/..."
+}
+
+action {
+  define_artifacts {
+    regex: "**/sponge_log.*"
+  }
+}

kokoro/linux/python39/continuous.cfg

@@ -1,21 +1 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/bazel.sh"
-timeout_mins: 120
-
-env_vars {
-  key: "CONTAINER_IMAGE"
-  value: "gcr.io/protobuf-build/python/linux:3.9-2f706fd1ab49f4e97af769388be486069b63efee"
-}
-
-env_vars {
-  key: "BAZEL_TARGETS"
-  value: "//python/... @upb//python/..."
-}
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.*"
-  }
-}
+# Keep this file empty! Use common.cfg instead.

kokoro/linux/python39/presubmit.cfg

@@ -1,21 +1 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/bazel.sh"
-timeout_mins: 120
-
-env_vars {
-  key: "CONTAINER_IMAGE"
-  value: "gcr.io/protobuf-build/python/linux:3.9-2f706fd1ab49f4e97af769388be486069b63efee"
-}
-
-env_vars {
-  key: "BAZEL_TARGETS"
-  value: "//python/... @upb//python/..."
-}
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.*"
-  }
-}
+# Keep this file empty! Use common.cfg instead.

kokoro/linux/python39_cpp/common.cfg

@@ -0,0 +1,27 @@
+# Config file for running tests in Kokoro
+
+# Location of the build script in repository
+build_file: "protobuf/kokoro/linux/bazel.sh"
+timeout_mins: 120
+
+env_vars {
+  key: "CONTAINER_IMAGE"
+  value: "gcr.io/protobuf-build/python/linux:3.9-2f706fd1ab49f4e97af769388be486069b63efee"
+}
+
+env_vars {
+  key: "BAZEL_TARGETS"
+  # Note: upb tests don't work since the C++ extension takes precedence here.
+  value: "//python/..."
+}
+
+env_vars {
+  key: "BAZEL_EXTRA_FLAGS"
+  value: "--define=use_fast_cpp_protos=true"
+}
+
+action {
+  define_artifacts {
+    regex: "**/sponge_log.*"
+  }
+}

kokoro/linux/python39_cpp/continuous.cfg

@@ -1,27 +1 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/bazel.sh"
-timeout_mins: 120
-
-env_vars {
-  key: "CONTAINER_IMAGE"
-  value: "gcr.io/protobuf-build/python/linux:3.9-2f706fd1ab49f4e97af769388be486069b63efee"
-}
-
-env_vars {
-  key: "BAZEL_TARGETS"
-  # Note: upb tests don't work since the C++ extension takes precedence here.
-  value: "//python/..."
-}
-
-env_vars {
-  key: "BAZEL_EXTRA_FLAGS"
-  value: "--define=use_fast_cpp_protos=true"
-}
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.*"
-  }
-}
+# Keep this file empty! Use common.cfg instead.

kokoro/linux/python39_cpp/presubmit.cfg

@@ -1,27 +1 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/bazel.sh"
-timeout_mins: 120
-
-env_vars {
-  key: "CONTAINER_IMAGE"
-  value: "gcr.io/protobuf-build/python/linux:3.9-2f706fd1ab49f4e97af769388be486069b63efee"
-}
-
-env_vars {
-  key: "BAZEL_TARGETS"
-  # Note: upb tests don't work since the C++ extension takes precedence here.
-  value: "//python/..."
-}
-
-env_vars {
-  key: "BAZEL_EXTRA_FLAGS"
-  value: "--define=use_fast_cpp_protos=true"
-}
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.*"
-  }
-}
+# Keep this file empty! Use common.cfg instead.

kokoro/linux/python_aarch64/common.cfg

@@ -0,0 +1,11 @@
+# Config file for running tests in Kokoro
+
+# Location of the build script in repository
+build_file: "protobuf/kokoro/linux/python_aarch64/build.sh"
+timeout_mins: 120
+
+action {
+  define_artifacts {
+    regex: "**/sponge_log.xml"
+  }
+}

kokoro/linux/python_aarch64/continuous.cfg

@@ -1,11 +1 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/python_aarch64/build.sh"
-timeout_mins: 120
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.xml"
-  }
-}
+# Keep this file empty! Use common.cfg instead.

kokoro/linux/python_aarch64/presubmit.cfg

@@ -1,11 +1 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/python_aarch64/build.sh"
-timeout_mins: 120
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.xml"
-  }
-}
+# Keep this file empty! Use common.cfg instead.

kokoro/linux/ruby25/common.cfg

@@ -0,0 +1,26 @@
+# Config file for running tests in Kokoro
+
+# Location of the build script in repository
+build_file: "protobuf/kokoro/linux/bazel.sh"
+timeout_mins: 120
+
+env_vars {
+  key: "CONTAINER_IMAGE"
+  value: "gcr.io/protobuf-build/ruby/linux:ruby-2.5.1-64e8944e4f18d7d6c9649112a8a93be57e693cd8"
+}
+
+env_vars {
+  key: "BAZEL_TARGETS"
+  value: "//ruby/..."
+}
+
+env_vars {
+  key: "BAZEL_EXTRA_FLAGS"
+  value: "--define=ruby_platform=c"
+}
+
+action {
+  define_artifacts {
+    regex: "**/sponge_log.*"
+  }
+}

kokoro/linux/ruby25/continuous.cfg

@@ -1,26 +1 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/bazel.sh"
-timeout_mins: 120
-
-env_vars {
-  key: "CONTAINER_IMAGE"
-  value: "gcr.io/protobuf-build/ruby/linux:ruby-2.5.1-64e8944e4f18d7d6c9649112a8a93be57e693cd8"
-}
-
-env_vars {
-  key: "BAZEL_TARGETS"
-  value: "//ruby/..."
-}
-
-env_vars {
-  key: "BAZEL_EXTRA_FLAGS"
-  value: "--define=ruby_platform=c"
-}
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.*"
-  }
-}
+# Keep this file empty! Use common.cfg instead.

kokoro/linux/ruby25/presubmit.cfg

@@ -1,26 +1 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/bazel.sh"
-timeout_mins: 120
-
-env_vars {
-  key: "CONTAINER_IMAGE"
-  value: "gcr.io/protobuf-build/ruby/linux:ruby-2.5.1-64e8944e4f18d7d6c9649112a8a93be57e693cd8"
-}
-
-env_vars {
-  key: "BAZEL_TARGETS"
-  value: "//ruby/..."
-}
-
-env_vars {
-  key: "BAZEL_EXTRA_FLAGS"
-  value: "--define=ruby_platform=c"
-}
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.*"
-  }
-}
+# Keep this file empty! Use common.cfg instead.

kokoro/linux/ruby26/common.cfg

@@ -0,0 +1,26 @@
+# Config file for running tests in Kokoro
+
+# Location of the build script in repository
+build_file: "protobuf/kokoro/linux/bazel.sh"
+timeout_mins: 120
+
+env_vars {
+  key: "CONTAINER_IMAGE"
+  value: "gcr.io/protobuf-build/ruby/linux:ruby-2.6.0-64e8944e4f18d7d6c9649112a8a93be57e693cd8"
+}
+
+env_vars {
+  key: "BAZEL_TARGETS"
+  value: "//ruby/..."
+}
+
+env_vars {
+  key: "BAZEL_EXTRA_FLAGS"
+  value: "--define=ruby_platform=c"
+}
+
+action {
+  define_artifacts {
+    regex: "**/sponge_log.*"
+  }
+}

kokoro/linux/ruby26/continuous.cfg

@@ -1,26 +1 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/bazel.sh"
-timeout_mins: 120
-
-env_vars {
-  key: "CONTAINER_IMAGE"
-  value: "gcr.io/protobuf-build/ruby/linux:ruby-2.6.0-64e8944e4f18d7d6c9649112a8a93be57e693cd8"
-}
-
-env_vars {
-  key: "BAZEL_TARGETS"
-  value: "//ruby/..."
-}
-
-env_vars {
-  key: "BAZEL_EXTRA_FLAGS"
-  value: "--define=ruby_platform=c"
-}
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.*"
-  }
-}
+# Keep this file empty! Use common.cfg instead.

kokoro/linux/ruby26/presubmit.cfg

@@ -1,26 +1 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/bazel.sh"
-timeout_mins: 120
-
-env_vars {
-  key: "CONTAINER_IMAGE"
-  value: "gcr.io/protobuf-build/ruby/linux:ruby-2.6.0-64e8944e4f18d7d6c9649112a8a93be57e693cd8"
-}
-
-env_vars {
-  key: "BAZEL_TARGETS"
-  value: "//ruby/..."
-}
-
-env_vars {
-  key: "BAZEL_EXTRA_FLAGS"
-  value: "--define=ruby_platform=c"
-}
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.*"
-  }
-}
+# Keep this file empty! Use common.cfg instead.

kokoro/linux/ruby27/common.cfg

@@ -0,0 +1,26 @@
+# Config file for running tests in Kokoro
+
+# Location of the build script in repository
+build_file: "protobuf/kokoro/linux/bazel.sh"
+timeout_mins: 120
+
+env_vars {
+  key: "CONTAINER_IMAGE"
+  value: "gcr.io/protobuf-build/ruby/linux:ruby-2.7.0-64e8944e4f18d7d6c9649112a8a93be57e693cd8"
+}
+
+env_vars {
+  key: "BAZEL_TARGETS"
+  value: "//ruby/..."
+}
+
+env_vars {
+  key: "BAZEL_EXTRA_FLAGS"
+  value: "--define=ruby_platform=c"
+}
+
+action {
+  define_artifacts {
+    regex: "**/sponge_log.*"
+  }
+}

kokoro/linux/ruby27/continuous.cfg

@@ -1,26 +1 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/bazel.sh"
-timeout_mins: 120
-
-env_vars {
-  key: "CONTAINER_IMAGE"
-  value: "gcr.io/protobuf-build/ruby/linux:ruby-2.7.0-64e8944e4f18d7d6c9649112a8a93be57e693cd8"
-}
-
-env_vars {
-  key: "BAZEL_TARGETS"
-  value: "//ruby/..."
-}
-
-env_vars {
-  key: "BAZEL_EXTRA_FLAGS"
-  value: "--define=ruby_platform=c"
-}
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.*"
-  }
-}
+# Keep this file empty! Use common.cfg instead.

kokoro/linux/ruby27/presubmit.cfg

@@ -1,26 +1 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/bazel.sh"
-timeout_mins: 120
-
-env_vars {
-  key: "CONTAINER_IMAGE"
-  value: "gcr.io/protobuf-build/ruby/linux:ruby-2.7.0-64e8944e4f18d7d6c9649112a8a93be57e693cd8"
-}
-
-env_vars {
-  key: "BAZEL_TARGETS"
-  value: "//ruby/..."
-}
-
-env_vars {
-  key: "BAZEL_EXTRA_FLAGS"
-  value: "--define=ruby_platform=c"
-}
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.*"
-  }
-}
+# Keep this file empty! Use common.cfg instead.

kokoro/linux/ruby30/common.cfg

@@ -0,0 +1,26 @@
+# Config file for running tests in Kokoro
+
+# Location of the build script in repository
+build_file: "protobuf/kokoro/linux/bazel.sh"
+timeout_mins: 120
+
+env_vars {
+  key: "CONTAINER_IMAGE"
+  value: "gcr.io/protobuf-build/ruby/linux:ruby-3.0.2-2f706fd1ab49f4e97af769388be486069b63efee"
+}
+
+env_vars {
+  key: "BAZEL_TARGETS"
+  value: "//ruby/..."
+}
+
+env_vars {
+  key: "BAZEL_EXTRA_FLAGS"
+  value: "--define=ruby_platform=c"
+}
+
+action {
+  define_artifacts {
+    regex: "**/sponge_log.*"
+  }
+}

kokoro/linux/ruby30/continuous.cfg

@@ -1,26 +1 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/bazel.sh"
-timeout_mins: 120
-
-env_vars {
-  key: "CONTAINER_IMAGE"
-  value: "gcr.io/protobuf-build/ruby/linux:ruby-3.0.2-2f706fd1ab49f4e97af769388be486069b63efee"
-}
-
-env_vars {
-  key: "BAZEL_TARGETS"
-  value: "//ruby/..."
-}
-
-env_vars {
-  key: "BAZEL_EXTRA_FLAGS"
-  value: "--define=ruby_platform=c"
-}
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.*"
-  }
-}
+# Keep this file empty! Use common.cfg instead.

kokoro/linux/ruby30/presubmit.cfg

@@ -1,26 +1 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/bazel.sh"
-timeout_mins: 120
-
-env_vars {
-  key: "CONTAINER_IMAGE"
-  value: "gcr.io/protobuf-build/ruby/linux:ruby-3.0.2-2f706fd1ab49f4e97af769388be486069b63efee"
-}
-
-env_vars {
-  key: "BAZEL_TARGETS"
-  value: "//ruby/..."
-}
-
-env_vars {
-  key: "BAZEL_EXTRA_FLAGS"
-  value: "--define=ruby_platform=c"
-}
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.*"
-  }
-}
+# Keep this file empty! Use common.cfg instead.

kokoro/linux/ruby31/common.cfg

@@ -0,0 +1,26 @@
+# Config file for running tests in Kokoro
+
+# Location of the build script in repository
+build_file: "protobuf/kokoro/linux/bazel.sh"
+timeout_mins: 120
+
+env_vars {
+  key: "CONTAINER_IMAGE"
+  value: "gcr.io/protobuf-build/ruby/linux:ruby-3.1.0-64e8944e4f18d7d6c9649112a8a93be57e693cd8"
+}
+
+env_vars {
+  key: "BAZEL_TARGETS"
+  value: "//ruby/..."
+}
+
+env_vars {
+  key: "BAZEL_EXTRA_FLAGS"
+  value: "--define=ruby_platform=c"
+}
+
+action {
+  define_artifacts {
+    regex: "**/sponge_log.*"
+  }
+}

kokoro/linux/ruby31/continuous.cfg

@@ -1,26 +1 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/bazel.sh"
-timeout_mins: 120
-
-env_vars {
-  key: "CONTAINER_IMAGE"
-  value: "gcr.io/protobuf-build/ruby/linux:ruby-3.1.0-64e8944e4f18d7d6c9649112a8a93be57e693cd8"
-}
-
-env_vars {
-  key: "BAZEL_TARGETS"
-  value: "//ruby/..."
-}
-
-env_vars {
-  key: "BAZEL_EXTRA_FLAGS"
-  value: "--define=ruby_platform=c"
-}
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.*"
-  }
-}
+# Keep this file empty! Use common.cfg instead.

kokoro/linux/ruby31/presubmit.cfg

@@ -1,26 +1 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/bazel.sh"
-timeout_mins: 120
-
-env_vars {
-  key: "CONTAINER_IMAGE"
-  value: "gcr.io/protobuf-build/ruby/linux:ruby-3.1.0-64e8944e4f18d7d6c9649112a8a93be57e693cd8"
-}
-
-env_vars {
-  key: "BAZEL_TARGETS"
-  value: "//ruby/..."
-}
-
-env_vars {
-  key: "BAZEL_EXTRA_FLAGS"
-  value: "--define=ruby_platform=c"
-}
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.*"
-  }
-}
+# Keep this file empty! Use common.cfg instead.

kokoro/linux/ruby_aarch64/common.cfg

@@ -0,0 +1,11 @@
+# Config file for running tests in Kokoro
+
+# Location of the build script in repository
+build_file: "protobuf/kokoro/linux/ruby_aarch64/build.sh"
+timeout_mins: 120
+
+action {
+  define_artifacts {
+    regex: "**/sponge_log.xml"
+  }
+}

kokoro/linux/ruby_aarch64/continuous.cfg

@@ -1,11 +1 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/ruby_aarch64/build.sh"
-timeout_mins: 120
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.xml"
-  }
-}
+# Keep this file empty! Use common.cfg instead.

kokoro/linux/ruby_aarch64/presubmit.cfg

@@ -1,11 +1 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/ruby_aarch64/build.sh"
-timeout_mins: 120
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.xml"
-  }
-}
+# Keep this file empty! Use common.cfg instead.