diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-04-22 06:22:50 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-22 06:22:50 -0400 |
| commit | 67a1b520e38d9860345bdece2026c4f7a95cb8fd (patch) | |
| tree | ee3f57c09f66105a8419ad6ce2993b386060b19a | |
| parent | 2627345dd5b8550242033212e6481af970537510 (diff) | |
| parent | 566b6071d42984fc401cfb297900d7b1498e11c7 (diff) | |
| download | podman-67a1b520e38d9860345bdece2026c4f7a95cb8fd.tar.gz podman-67a1b520e38d9860345bdece2026c4f7a95cb8fd.tar.bz2 podman-67a1b520e38d9860345bdece2026c4f7a95cb8fd.zip | |
Merge pull request #13956 from cevich/fix_git_id
Cirrus: Fix missing git-enforced runtime identity
| -rw-r--r-- | .cirrus.yml | 4 | ||||
| -rwxr-xr-x | contrib/cirrus/setup_environment.sh | 5 |
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. |