Update Bot information only if git email currently unset

canonical · Sep 17, 2024 · fec52d5 · fec52d5
1 parent 29f1a6e
commit fec52d5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/build-scripts/patches/moonray/apply b/build-scripts/patches/moonray/apply
@@ -2,9 +2,12 @@
 
 DIR="$(realpath "$(dirname "${0}")")"
 
-# Configure git author
-git config user.email k8s-bot@canonical.com
-git config user.name k8s-bot
+# Configure git author if unset
+git_email=$(git config --default "" user.email)
+if [ -z "${git_email}" ]; then
+    git config user.email k8s-team-ci@canonical.com
+    git config user.name 'k8s-team-ci (CDK Bot)'
+fi
 
 # Remove unrelated tests
 rm "${DIR}/../../../tests/integration/tests/test_cilium_e2e.py"

diff --git a/build-scripts/patches/strict/apply b/build-scripts/patches/strict/apply
@@ -3,8 +3,11 @@
 DIR="$(realpath "$(dirname "${0}")")"
 
 # Configure git author
-git config user.email k8s-bot@canonical.com
-git config user.name k8s-bot
+git_email=$(git config --default "" user.email)
+if [ -z "${git_email}" ]; then
+    git config user.email k8s-team-ci@canonical.com
+    git config user.name 'k8s-team-ci (CDK Bot)'
+fi
 
 # Apply strict patch
 git am "${DIR}/0001-Strict-patch.patch"