Fix fastforward git user configuration #2503
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The recent git auto fast forward jobs fails because of the misconfigured git user: https://storage.googleapis.com/kubernetes-jenkins/logs/ci-fast-forward/1516649755411746816/build-log.txt ``` Step #3: level=info msg="Merging main branch changes into release branch" Step #3: level=fatal msg="merge main ref: run git merge: command /usr/bin/git merge -X ours origin/master did not succeed: Committer identity unknown\n\n*** Please tell me who you are.\n\nRun\n\n git config --global user.email \"you@example.com\"\n git config --global user.name \"Your Name\"\n\nto set your account's default identity.\nOmit --global to set the identity only in this repository.\n\nfatal: unable to auto-detect email address (got 'root@c96ac26cb82d.(none)')\n" Finished Step #3 ERROR ``` We now fix this by doing the same configuration like we do in krel stage and release. Signed-off-by: Sascha Grunert <sgrunert@redhat.com>
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: cpanato, saschagrunert The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What type of PR is this?
/kind bug
What this PR does / why we need it:
The recent git auto fast forward jobs fails because of the misconfigured
git user:
https://storage.googleapis.com/kubernetes-jenkins/logs/ci-fast-forward/1516649755411746816/build-log.txt
We now fix this by doing the same configuration like we do in krel
stage and release.
Which issue(s) this PR fixes:
Refers to #2386
Special notes for your reviewer:
None
Does this PR introduce a user-facing change?