summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Evich <cevich@redhat.com>2022-03-01 15:34:35 -0500
committerChris Evich <cevich@redhat.com>2022-04-21 16:23:36 -0400
commit566b6071d42984fc401cfb297900d7b1498e11c7 (patch)
tree821dcdffa23fca2c18d2aafb67d99104b15c653a
parentcb09c26c6519c2fff8be7285d585672a9066f2da (diff)
downloadpodman-566b6071d42984fc401cfb297900d7b1498e11c7.tar.gz
podman-566b6071d42984fc401cfb297900d7b1498e11c7.tar.bz2
podman-566b6071d42984fc401cfb297900d7b1498e11c7.zip
Cirrus: Fix missing git-enforced runtime identity
Newer versions of git (like `2.35`) fail on certain operations (like `rebase` and `am`) without a local identity. Add a fake one from the start, with a clearly identifiable test-value to avoid problems at runtime. Signed-off-by: Chris Evich <cevich@redhat.com>
-rw-r--r--.cirrus.yml4
-rwxr-xr-xcontrib/cirrus/setup_environment.sh5
2 files changed, 9 insertions, 0 deletions
diff --git a/.cirrus.yml b/.cirrus.yml
index c984c8859..cf97f4467 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -101,6 +101,10 @@ ext_svc_check_task:
else
git reset --hard $CIRRUS_CHANGE_IN_REPO
fi
+ # Some test operations & checks require a git "identity"
+ _gc='git config --file /root/.gitconfig'
+ $_gc user.email "TMcTestFace@example.com"
+ $_gc user.name "Testy McTestface"
make install.tools
setup_script: &setup '$GOSRC/$SCRIPT_BASE/setup_environment.sh'
diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh
index 906a898b2..a7d0f7fa1 100755
--- a/contrib/cirrus/setup_environment.sh
+++ b/contrib/cirrus/setup_environment.sh
@@ -41,6 +41,11 @@ cp hack/podman-registry /bin
# Make sure cni network plugins directory exists
mkdir -p /etc/cni/net.d
+# Some test operations & checks require a git "identity"
+_gc='git config --file /root/.gitconfig'
+$_gc user.email "TMcTestFace@example.com"
+$_gc user.name "Testy McTestface"
+
# Ensure that all lower-level contexts and child-processes have
# ready access to higher level orchestration (e.g Cirrus-CI)
# variables.