From d45609613111149a0c923dcba9ae2d790526c2e6 Mon Sep 17 00:00:00 2001
From: Anthonios Partheniou <partheniou@google.com>
Date: Tue, 16 Sep 2025 15:47:49 +0000
Subject: [PATCH 1/4] chore: run system tests only for modified packages

---
 .kokoro/system.sh | 37 ++++++++++++++++++++++++++++---------
 1 file changed, 28 insertions(+), 9 deletions(-)

diff --git a/.kokoro/system.sh b/.kokoro/system.sh
index 5c4cad3a55f1..c15d4d241f86 100755
--- a/.kokoro/system.sh
+++ b/.kokoro/system.sh
@@ -38,21 +38,40 @@ pwd
 # A file for running system tests
 system_test_script="${PROJECT_ROOT}/.kokoro/system-single.sh"
 
+# This is needed in order for `git diff` to succeed
+git config --global --add safe.directory $(realpath .)
+
 # Run system tests for each package with directory packages/*/tests/system
 for dir in `find 'packages' -type d -wholename 'packages/*/tests/system'`; do
   # Get the path to the package by removing the suffix /tests/system
   package=$(echo $dir | cut -f -2 -d '/')
-  echo "Running system tests for ${package}"
-  pushd ${package}
-  # Temporarily allow failure.
+  should_test=false
+
+  files_to_check=${package}/CHANGELOG.md
+
+  echo "checking changes with 'git diff "${KOKORO_GITHUB_PULL_REQUEST_TARGET_BRANCH}...${KOKORO_GITHUB_PULL_REQUEST_COMMIT}" -- ${files_to_check}'"
   set +e
-  ${system_test_script}
-  ret=$?
+  package_modified=$(git diff "${KOKORO_GITHUB_PULL_REQUEST_TARGET_BRANCH}...${KOKORO_GITHUB_PULL_REQUEST_COMMIT}" -- ${files_to_check} | wc -l)
   set -e
-  if [ ${ret} -ne 0 ]; then
-      RETVAL=${ret}
+  if [[ "${package_modified}" -eq 0 ]]; then
+      echo "no change detected in ${files_to_check}, skipping"
+  else
+      echo "change detected in ${files_to_check}"
+      should_test=true
   fi
-  popd
-done
+  if [ "${should_test}" = true ]; then
+      echo "Running system tests for ${package}"
 
+      pushd ${package}
+      # Temporarily allow failure.
+      set +e
+      ${system_test_script}
+      ret=$?
+      set -e
+      if [ ${ret} -ne 0 ]; then
+          RETVAL=${ret}
+      fi
+      popd
+  fi
+done
 exit ${RETVAL}

From 0de4aebfec97f19962de28acf1f65749027a842c Mon Sep 17 00:00:00 2001
From: Anthonios Partheniou <partheniou@google.com>
Date: Tue, 16 Sep 2025 15:50:05 +0000
Subject: [PATCH 2/4] test dlp

---
 packages/google-cloud-dlp/CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/google-cloud-dlp/CHANGELOG.md b/packages/google-cloud-dlp/CHANGELOG.md
index 541e4f1a96b4..4522c6d82ee1 100644
--- a/packages/google-cloud-dlp/CHANGELOG.md
+++ b/packages/google-cloud-dlp/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 [PyPI History][1]
 
+
 [1]: https://pypi.org/project/google-cloud-dlp/#history
 
 ## [3.32.0](https://github.com/googleapis/google-cloud-python/compare/google-cloud-dlp-v3.31.0...google-cloud-dlp-v3.32.0) (2025-09-15)

From d6a108515a3719c06110125f55ea0bd980a5ad17 Mon Sep 17 00:00:00 2001
From: Anthonios Partheniou <partheniou@google.com>
Date: Tue, 16 Sep 2025 16:01:41 +0000
Subject: [PATCH 3/4] Revert "test dlp"

This reverts commit 0de4aebfec97f19962de28acf1f65749027a842c.
---
 packages/google-cloud-dlp/CHANGELOG.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/google-cloud-dlp/CHANGELOG.md b/packages/google-cloud-dlp/CHANGELOG.md
index 4522c6d82ee1..541e4f1a96b4 100644
--- a/packages/google-cloud-dlp/CHANGELOG.md
+++ b/packages/google-cloud-dlp/CHANGELOG.md
@@ -2,7 +2,6 @@
 
 [PyPI History][1]
 
-
 [1]: https://pypi.org/project/google-cloud-dlp/#history
 
 ## [3.32.0](https://github.com/googleapis/google-cloud-python/compare/google-cloud-dlp-v3.31.0...google-cloud-dlp-v3.32.0) (2025-09-15)

From 5ff87d33cff6887263876803a0d764738bf1bec6 Mon Sep 17 00:00:00 2001
From: Anthonios Partheniou <partheniou@google.com>
Date: Tue, 16 Sep 2025 19:50:46 +0000
Subject: [PATCH 4/4] address review feedback

---
 .kokoro/system.sh | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.kokoro/system.sh b/.kokoro/system.sh
index c15d4d241f86..ffcd464aa66b 100755
--- a/.kokoro/system.sh
+++ b/.kokoro/system.sh
@@ -45,7 +45,6 @@ git config --global --add safe.directory $(realpath .)
 for dir in `find 'packages' -type d -wholename 'packages/*/tests/system'`; do
   # Get the path to the package by removing the suffix /tests/system
   package=$(echo $dir | cut -f -2 -d '/')
-  should_test=false
 
   files_to_check=${package}/CHANGELOG.md
 
@@ -57,11 +56,7 @@ for dir in `find 'packages' -type d -wholename 'packages/*/tests/system'`; do
       echo "no change detected in ${files_to_check}, skipping"
   else
       echo "change detected in ${files_to_check}"
-      should_test=true
-  fi
-  if [ "${should_test}" = true ]; then
       echo "Running system tests for ${package}"
-
       pushd ${package}
       # Temporarily allow failure.
       set +e