Merge branch 'main' into release-please--branches--main

googleapis · Oct 16, 2023 · 2856f92 · 2856f92
2 parents e3f15ce + df4385e
commit 2856f92
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml
@@ -36,6 +36,7 @@ branchProtectionRules:
     - "Kokoro - Test: Integration"
     - "Kokoro - Test: Java GraalVM Native Image"
     - "Kokoro - Test: Java 17 GraalVM Native Image"
+    - "Kokoro - Test: Docker Image Validation"
     - "dependencies (11, java-bigquery)"
     - "dependencies (11, java-spanner)"
     - "dependencies (11, java-storage)"

diff --git a/.kokoro/verify-docker-images.sh b/.kokoro/verify-docker-images.sh
@@ -8,6 +8,8 @@ function fetch_image_names() {
   echo "$imageNames"
 }
 
+git config --global --add safe.directory /tmpfs/src/github/java-shared-config
+
 # Get the directory of the build script
 scriptDir=$(realpath "$(dirname "${BASH_SOURCE[0]}")")
 # cd to the parent directory, i.e. the root of the git repo
@@ -19,11 +21,6 @@ javaSharedConfigVersion="$(mvn help:evaluate -Dexpression=project.version -q -Df
 branchName=$(git name-rev "${KOKORO_GIT_COMMIT}" | sed 's/.* //')
 gitCommitMessage=$(git log -1 "$(git rev-parse --short "${KOKORO_GIT_COMMIT}")" | grep "chore(main): release *")
 
-echo "Debug KOKORO_GIT_COMMIT"
-echo "${KOKORO_GIT_COMMIT}"
-echo "${branchName}"
-echo "${gitCommitMessage}"
-
 # GraalVM docker images are not tagged with SNAPSHOT versions.
 if [[ "${branchName}" == *"release-please--branches--main"* ]] && [[ ! $gitCommitMessage =~ "SNAPSHOT" ]]; then
   imageNames=$(fetch_image_names)