[JIRA] (JENKINS-45228) Git merge requires authentication in LFS merges, plugin does not authenticate the git merge command
Title: Message Title Mark Waite updated JENKINS-45228 Fixed in git client plugin 3.1.0 release Jan 18, 2020. Jenkins / JENKINS-45228 Git merge requires authentication in LFS merges, plugin does not authenticate the git merge command Change By: Mark Waite Status: Fixed but Unreleased Closed Released As: git client plugin 3.1.0 Add Comment This message was sent by Atlassian Jira (v7.13.6#713006-sha1:cc4451f) -- You received this message because you are subscribed to the Google Groups "Jenkins Issues" group. To unsubscribe from this group and stop receiving emails from it, send an email to
[JIRA] (JENKINS-45228) Git merge requires authentication in LFS merges, plugin does not authenticate the git merge command
Title: Message Title
Kalle Niemitalo edited a comment on JENKINS-45228
Re: Git merge requires authentication in LFS merges, plugin does not authenticate the git merge command
Thanks, I see the git-client 3.1.0-beta binary is available from the [experimental update center|https://jenkins.io/doc/developer/publishing/releasing-experimental-updates/].It seems to be working OK so far, when a multibranch pipeline with Bitbucket Branch Source was merging merges a pull request to a branch in which LFS files have been modified. I also verified that attempting the same merges with git-client 3.0.0 causes the build to hang because of repetitive authentication errors. (To verify this, I had to delete the workspace first, as Git LFS would otherwise have reused the LFS files that it cached when git-client 3.1.0-beta provided the credential.) I have not tested running {{checkout}} as a pipeline step from within Jenkinsfile, with either version of git-client.I should perhaps file a separate issue about the GIT_ASKPASS=echo environment variable.
Add Comment
This message was sent by Atlassian Jira (v7.13.6#713006-sha1:cc4451f)
--
You received this message because you are subscribed to the Google Groups "Jenkins Issues" group.
To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-issues/JIRA.183359.1498813755000.3422.1578384481120%40Atlassian.JIRA.
[JIRA] (JENKINS-45228) Git merge requires authentication in LFS merges, plugin does not authenticate the git merge command
Title: Message Title
Kalle Niemitalo edited a comment on JENKINS-45228
Re: Git merge requires authentication in LFS merges, plugin does not authenticate the git merge command
Thanks, I see the git-client 3.1.0-beta binary is available from the [experimental update center|https://jenkins.io/doc/developer/publishing/releasing-experimental-updates/].It seems to be working OK so far, when a multibranch pipeline with Bitbucket Branch Source was merging a pull request to a branch in which LFS files have been modified. I also verified that attempting the same merges with git-client 3.0.0 causes the build to hang because of repetitive authentication errors.I have not tested running {{checkout}} as a pipeline step from within Jenkinsfile, with either version of git-client.I should perhaps file a separate issue about the GIT_ASKPASS=echo environment variable.
Add Comment
This message was sent by Atlassian Jira (v7.13.6#713006-sha1:cc4451f)
--
You received this message because you are subscribed to the Google Groups "Jenkins Issues" group.
To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-issues/JIRA.183359.1498813755000.3396.1578384300878%40Atlassian.JIRA.
[JIRA] (JENKINS-45228) Git merge requires authentication in LFS merges, plugin does not authenticate the git merge command
Title: Message Title Kalle Niemitalo edited a comment on JENKINS-45228 Re: Git merge requires authentication in LFS merges, plugin does not authenticate the git merge command Thanks, I see the git-client 3.1.0-beta binary is available from the [experimental update center|https://jenkins.io/doc/developer/publishing/releasing-experimental-updates/].It seems to be working OK so far, when merging a pull request to a branch in merges that involve some which LFS files , but I have not yet been modified. I also verified whether that attempting the previous version of the same merges with git-client plugin would fail in these specific merges 3 . 0.0 causes the build to hang because of repetitive authentication errors. I should perhaps file a separate issue about the GIT_ASKPASS=echo environment variable. Add Comment This message was sent by Atlassian Jira (v7.13.6#713006-sha1:cc4451f) -- You received this message because you are subscribed to the Google Groups "Jenkins Issues" group. To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-issues/JIRA.183359.1498813755000.3370.1578383820840%40Atlassian.JIRA.
[JIRA] (JENKINS-45228) Git merge requires authentication in LFS merges, plugin does not authenticate the git merge command
Title: Message Title Kalle Niemitalo edited a comment on JENKINS-45228 Re: Git merge requires authentication in LFS merges, plugin does not authenticate the git merge command Thanks, I see the git-client 3.1.0-beta binary is available from the [experimental update center|https://jenkins.io/doc/developer/publishing/releasing-experimental-updates/]. It seems to be working OK so far, in merges that involve some LFS files, but I have not yet verified whether the previous version of the git-client plugin would fail in these specific merges. Add Comment This message was sent by Atlassian Jira (v7.13.6#713006-sha1:cc4451f) -- You received this message because you are subscribed to the Google Groups "Jenkins Issues" group. To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-issues/JIRA.183359.1498813755000.3368.1578383041099%40Atlassian.JIRA.
[JIRA] (JENKINS-45228) Git merge requires authentication in LFS merges, plugin does not authenticate the git merge command
Title: Message Title Kalle Niemitalo commented on JENKINS-45228 Re: Git merge requires authentication in LFS merges, plugin does not authenticate the git merge command Thanks, I see the git-client 3.1.0-beta binary is available from the experimental update center. Add Comment This message was sent by Atlassian Jira (v7.13.6#713006-sha1:cc4451f) -- You received this message because you are subscribed to the Google Groups "Jenkins Issues" group. To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-issues/JIRA.183359.1498813755000.3314.1578381300670%40Atlassian.JIRA.
[JIRA] (JENKINS-45228) Git merge requires authentication in LFS merges, plugin does not authenticate the git merge command
Title: Message Title René Scheibe commented on JENKINS-45228 Re: Git merge requires authentication in LFS merges, plugin does not authenticate the git merge command I would like to ask everybody interested to test the beta version Mark Waite just released - see https://github.com/jenkinsci/git-client-plugin/releases/tag/git-client-3.1.0-beta Add Comment This message was sent by Atlassian Jira (v7.13.6#713006-sha1:cc4451f) -- You received this message because you are subscribed to the Google Groups "Jenkins Issues" group. To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-issues/JIRA.183359.1498813755000.2122.1578075000521%40Atlassian.JIRA.
[JIRA] (JENKINS-45228) Git merge requires authentication in LFS merges, plugin does not authenticate the git merge command
Title: Message Title René Scheibe updated JENKINS-45228 Jenkins / JENKINS-45228 Git merge requires authentication in LFS merges, plugin does not authenticate the git merge command Change By: René Scheibe Status: Open Fixed but Unreleased Resolution: Fixed Add Comment This message was sent by Atlassian Jira (v7.13.6#713006-sha1:cc4451f) -- You received this message because you are subscribed to the Google Groups "Jenkins Issues" group. To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-issues/JIRA.183359.1498813755000.2097.1578074821795%40Atlassian.JIRA.
[JIRA] (JENKINS-45228) Git merge requires authentication in LFS merges, plugin does not authenticate the git merge command
Title: Message Title
René Scheibe updated an issue
Jenkins / JENKINS-45228
Git merge requires authentication in LFS merges, plugin does not authenticate the git merge command
Change By:
René Scheibe
In case of changes in LFS data git merge requires authentication, but authentication data is not provided. Pipeline step:{code:java}def mr_checkout_with_merge(url, account) { checkout changelog: true, poll: true, scm: [$class: 'GitSCM',branches: [[name: '${gitlabSourceBranch}']],doGenerateSubmoduleConfigurations: false,extensions: [ [$class: 'RelativeTargetDirectory', relativeTargetDir: 'src'], [$class: 'UserIdentity', email: 'jenkins', name: 'jenkins'], [$class: 'SubmoduleOption', disableSubmodules: false, parentCredentials: true, recursiveSubmodules: true, reference: '', trackingSubmodules: false], [$class: 'PreBuildMerge', options: [fastForwardMode: 'NO_FF', mergeRemote: 'origin', mergeStrategy: 'default', mergeTarget: '${gitlabTargetBranch}']], [$class: 'CloneOption', depth: 0, noTags: false, reference: '', shallow: false, timeout: 60], [$class: 'GitLFSPull']],submoduleCfg: [],userRemoteConfigs: [[credentialsId: account, url: url]] ]}{code} Log output:{code:java}ERROR: Branch not suitable for integration as it does not merge cleanly: Command "git merge --no-ff 6af4f83cc9f2fc96d68df589e9822acf2fbf7fee" returned status code 128: stdout: stderr: Downloading data/test_data.tar.gz (106.24 MB) Error downloading object: data/test_data.tar.gz (1b3d845): Smudge error: Error downloading data/test_data.tar.gz (1b3d845ad0f78327a16db63e03a7bc60dd2f7134bbaeeb117c3602d037893eef): batch request: Permission denied (publickey).: exit status 255Errors logged to /home/jenkins/workspace/Precommits/Ubuntu16/src/.git/lfs/objects/logs/20170626T055343.268201821.log Use `git lfs logs last` to view the log. error: external filter git-lfs smudge – %f failed 2 error: external filter git-lfs smudge – %f failed fatal: data/test_data.tar.gz: smudge filter lfs failed{code}
Add Comment
[JIRA] (JENKINS-45228) Git merge requires authentication in LFS merges, plugin does not authenticate the git merge command
Title: Message Title
René Scheibe updated an issue
Jenkins / JENKINS-45228
Git merge requires authentication in LFS merges, plugin does not authenticate the git merge command
Change By:
René Scheibe
Environment:
Jenkins version: 2.46.3Git plugin version: 3.3.0
In case of changes in LFS data git merge requires authentication, but authentication data is not provided. Jenkins version: 2.46.3 Git plugin version: 3.3.0 Pipeline step:{code:java}def mr_checkout_with_merge(url, account) { checkout changelog: true, poll: true, scm: [$class: 'GitSCM',branches: [[name: '${gitlabSourceBranch}']],doGenerateSubmoduleConfigurations: false,extensions: [ [$class: 'RelativeTargetDirectory', relativeTargetDir: 'src'], [$class: 'UserIdentity', email: 'jenkins', name: 'jenkins'], [$class: 'SubmoduleOption', disableSubmodules: false, parentCredentials: true, recursiveSubmodules: true, reference: '', trackingSubmodules: false], [$class: 'PreBuildMerge', options: [fastForwardMode: 'NO_FF', mergeRemote: 'origin', mergeStrategy: 'default', mergeTarget: '${gitlabTargetBranch}']], [$class: 'CloneOption', depth: 0, noTags: false, reference: '', shallow: false, timeout: 60], [$class: 'GitLFSPull']],submoduleCfg: [],userRemoteConfigs: [[credentialsId: account, url: url]] ]}{code} Log output:{code:java}ERROR: Branch not suitable for integration as it does not merge cleanly: Command "git merge --no-ff 6af4f83cc9f2fc96d68df589e9822acf2fbf7fee" returned status code 128: stdout: stderr: Downloading data/test_data.tar.gz (106.24 MB) Error downloading object: data/test_data.tar.gz (1b3d845): Smudge error: Error downloading data/test_data.tar.gz (1b3d845ad0f78327a16db63e03a7bc60dd2f7134bbaeeb117c3602d037893eef): batch request: Permission denied (publickey).: exit status 255Errors logged to /home/jenkins/workspace/Precommits/Ubuntu16/src/.git/lfs/objects/logs/20170626T055343.268201821.log Use `git lfs logs last` to view the log. error: external filter git-lfs smudge – %f failed 2 error: external filter git-lfs smudge – %f failed fatal: data/test_data.tar.gz: smudge filter lfs failed{code}
[JIRA] (JENKINS-45228) Git merge requires authentication in LFS merges, plugin does not authenticate the git merge command
Title: Message Title
René Scheibe updated an issue
Jenkins / JENKINS-45228
Git merge requires authentication in LFS merges, plugin does not authenticate the git merge command
Change By:
René Scheibe
In case of changes in LFS data git merge requires authentication, but authentication data is not provided.Jenkins version: 2.46.3Git plugin version: 3.3.0Pipeline step and log :{code:java}def mr_checkout_with_merge(url, account) { checkout changelog: true, poll: true, scm: [$class: 'GitSCM',branches: [[name: '${gitlabSourceBranch}']],doGenerateSubmoduleConfigurations: false,extensions: [ [$class: 'RelativeTargetDirectory', relativeTargetDir: 'src'], [$class: 'UserIdentity', email: 'jenkins', name: 'jenkins'], [$class: 'SubmoduleOption', disableSubmodules: false, parentCredentials: true, recursiveSubmodules: true, reference: '', trackingSubmodules: false], [$class: 'PreBuildMerge', options: [fastForwardMode: 'NO_FF', mergeRemote: 'origin', mergeStrategy: 'default', mergeTarget: '${gitlabTargetBranch}']], [$class: 'CloneOption', depth: 0, noTags: false, reference: '', shallow: false, timeout: 60], [$class: 'GitLFSPull']],submoduleCfg: [],userRemoteConfigs: [[credentialsId: account, url: url]] ]}{code} Log output: {code:java} ERROR: Branch not suitable for integration as it does not merge cleanly: Command "git merge --no-ff 6af4f83cc9f2fc96d68df589e9822acf2fbf7fee" returned status code 128: stdout: stderr: Downloading data/test_data.tar.gz (106.24 MB) Error downloading object: data/test_data.tar.gz (1b3d845): Smudge error: Error downloading data/test_data.tar.gz (1b3d845ad0f78327a16db63e03a7bc60dd2f7134bbaeeb117c3602d037893eef): batch request: Permission denied (publickey).: exit status 255 Errors logged to /home/jenkins/workspace/Precommits/Ubuntu16/src/.git/lfs/objects/logs/20170626T055343.268201821.log Use `git lfs logs last` to view the log. error: external filter git-lfs smudge – %f failed 2 error: external filter git-lfs smudge – %f failed fatal: data/test_data.tar.gz: smudge filter lfs failed {code}
Add Comment
[JIRA] (JENKINS-45228) Git merge requires authentication in LFS merges, plugin does not authenticate the git merge command
Title: Message Title René Scheibe updated an issue Jenkins / JENKINS-45228 Git merge requires authentication in LFS merges, plugin does not authenticate the git merge command Change By: René Scheibe Component/s: git-client-plugin Add Comment This message was sent by Atlassian Jira (v7.13.6#713006-sha1:cc4451f) -- You received this message because you are subscribed to the Google Groups "Jenkins Issues" group. To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-issues/JIRA.183359.1498813755000.80.1577366461070%40Atlassian.JIRA.
[JIRA] (JENKINS-45228) Git merge requires authentication in LFS merges, plugin does not authenticate the git merge command
Title: Message Title
René Scheibe updated an issue
Jenkins / JENKINS-45228
Git merge requires authentication in LFS merges, plugin does not authenticate the git merge command
Change By:
René Scheibe
In case of changes in LFS data git merge requires authentication, but authentication data is not provided.Jenkins version: 2.46.3Git plugin version: 3.3.0Pipeline step and log:{code:java}def mr_checkout_with_merge(url, account) {checkout changelog: true, poll: true, scm: [$class: 'GitSCM',branches: [[name: '${gitlabSourceBranch}']],doGenerateSubmoduleConfigurations: false,extensions: [[$class: 'RelativeTargetDirectory', relativeTargetDir: 'src'],[$class: 'UserIdentity', email: 'jenkins', name: 'jenkins'],[$class: 'SubmoduleOption', disableSubmodules: false, parentCredentials: true, recursiveSubmodules: true, reference: '', trackingSubmodules: false],[$class: 'PreBuildMerge', options: [fastForwardMode: 'NO_FF', mergeRemote: 'origin', mergeStrategy: 'default', mergeTarget: '${gitlabTargetBranch}']],[$class: 'CloneOption', depth: 0, noTags: false, reference: '', shallow: false, timeout: 60],[$class: 'GitLFSPull']],submoduleCfg: [],userRemoteConfigs: [[credentialsId: account, url: url]]]}{code} ERROR: Branch not suitable for integration as it does not merge cleanly: Command "git merge --no-ff 6af4f83cc9f2fc96d68df589e9822acf2fbf7fee" returned status code 128:stdout: stderr: Downloading data/test_data.tar.gz (106.24 MB)Error downloading object: data/test_data.tar.gz (1b3d845): Smudge error: Error downloading data/test_data.tar.gz (1b3d845ad0f78327a16db63e03a7bc60dd2f7134bbaeeb117c3602d037893eef): batch request: Permission denied (publickey).: exit status 255Errors logged to /home/jenkins/workspace/Precommits/Ubuntu16/src/.git/lfs/objects/logs/20170626T055343.268201821.logUse `git lfs logs last` to view the log.error: external filter git-lfs smudge -- – %f failed 2error: external filter git-lfs smudge -- – %f failedfatal: data/test_data.tar.gz: smudge filter lfs failed
Add Comment
[JIRA] (JENKINS-45228) Git merge requires authentication in LFS merges, plugin does not authenticate the git merge command
Title: Message Title Geoffroy Jabouley commented on JENKINS-45228 Re: Git merge requires authentication in LFS merges, plugin does not authenticate the git merge command Jonas Hanschke, you can check my ongoing PR (https://github.com/jenkinsci/git-client-plugin/pull/433, branch is based on v2.8.1), and recompile/install the plugin while change is being reviewed and integrated by Mark Waite Add Comment This message was sent by Atlassian Jira (v7.11.2#711002-sha1:fdc329d) -- You received this message because you are subscribed to the Google Groups "Jenkins Issues" group. To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-issues/JIRA.183359.1498813755000.570.1566898861158%40Atlassian.JIRA.
[JIRA] (JENKINS-45228) Git merge requires authentication in LFS merges, plugin does not authenticate the git merge command
Title: Message Title Jonas Hanschke edited a comment on JENKINS-45228 Re: Git merge requires authentication in LFS merges, plugin does not authenticate the git merge command A way to work around this problem is to rebase the PR's source branch onto the target branch. The problem occurs only when there are new LFS files in the target branch, which will not be the case anymore after a rebase (they will already be present in the source branch, then). Still, this is a very annoying bug, which blocks our workflow (that usually doesn't involve rebasing). Any heads-up on when a fix can be expected? Thanks! Add Comment This message was sent by Atlassian Jira (v7.11.2#711002-sha1:fdc329d) -- You received this message because you are subscribed to the Google Groups "Jenkins Issues" group. To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-issues/JIRA.183359.1498813755000.549.1566898260524%40Atlassian.JIRA.
[JIRA] (JENKINS-45228) Git merge requires authentication in LFS merges, plugin does not authenticate the git merge command
Title: Message Title Jonas Hanschke commented on JENKINS-45228 Re: Git merge requires authentication in LFS merges, plugin does not authenticate the git merge command A way to work around this problem is to rebase the PR's source branch onto the target branch. The problem occurs only when there are new LFS files in the target branch, which will not be the case anymore after a rebase (they will already be present in the source branch, then). Add Comment This message was sent by Atlassian Jira (v7.11.2#711002-sha1:fdc329d) -- You received this message because you are subscribed to the Google Groups "Jenkins Issues" group. To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-issues/JIRA.183359.1498813755000.528.1566898200643%40Atlassian.JIRA.
[JIRA] (JENKINS-45228) Git merge requires authentication in LFS merges, plugin does not authenticate the git merge command
Title: Message Title Geoffroy Jabouley edited a comment on JENKINS-45228 Re: Git merge requires authentication in LFS merges, plugin does not authenticate the git merge command Helloalso facing this issue in some cases where files where modified/added into source branch of PR.Any idea when/if LFS credentials support will be added to the merge portion of the git plugin? Maybe at least providing some implementation guidance for a future contributionBR Edit: [https://github.com/jenkinsci/git-client-plugin/pull/433] Add Comment This message was sent by Atlassian Jira (v7.11.2#711002-sha1:fdc329d) -- You received this message because you are subscribed to the Google Groups "Jenkins Issues" group. To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-issues/JIRA.183359.1498813755000.2307.1560853501215%40Atlassian.JIRA. For more options, visit https://groups.google.com/d/optout.
[JIRA] (JENKINS-45228) Git merge requires authentication in LFS merges, plugin does not authenticate the git merge command
Title: Message Title Geoffroy Jabouley edited a comment on JENKINS-45228 Re: Git merge requires authentication in LFS merges, plugin does not authenticate the git merge command Helloalso facing this issue in some cases where files where modified/added into source branch of PR.Any idea when/if LFS credentials support will be added to the merge portion of the git plugin? Maybe at leat least providing some implementation guidance for a future contributionBR Add Comment This message was sent by Atlassian Jira (v7.11.2#711002-sha1:fdc329d) -- You received this message because you are subscribed to the Google Groups "Jenkins Issues" group. To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-issues/JIRA.183359.1498813755000.25250.1560266641018%40Atlassian.JIRA. For more options, visit https://groups.google.com/d/optout.
[JIRA] (JENKINS-45228) Git merge requires authentication in LFS merges, plugin does not authenticate the git merge command
Title: Message Title Geoffroy Jabouley commented on JENKINS-45228 Re: Git merge requires authentication in LFS merges, plugin does not authenticate the git merge command Hello also facing this issue in some cases where files where modified/added into source branch of PR. Any idea when/if LFS credentials support will be added to the merge portion of the git plugin? Maybe at leat providing some implementation guidance for a future contribution BR Add Comment This message was sent by Atlassian Jira (v7.11.2#711002-sha1:fdc329d) -- You received this message because you are subscribed to the Google Groups "Jenkins Issues" group. To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-issues/JIRA.183359.1498813755000.24984.1560246420425%40Atlassian.JIRA. For more options, visit https://groups.google.com/d/optout.
[JIRA] (JENKINS-45228) Git merge requires authentication in LFS merges, plugin does not authenticate the git merge command
Title: Message Title Greg Whiteley commented on JENKINS-45228 Re: Git merge requires authentication in LFS merges, plugin does not authenticate the git merge command Thanks Andrey Babushkin - for me that can't work because the problem is on the "master" node as it tries to retrieve the Jenkinsfile - I'm using the Multi-branch Pipeline configuration, which (for a pull request) does: (On master) retrieve Jenkinsfile checkout repo (or update) checkout PR branch Merge to target branch Read Jenkinsfile for pipeline Execute Jenkinsfile Allocate a node node() Run scm functions checkout(scm) checkout repo (or update) checkout PR branch merge to target branch .. rest of Jenkinsfile ... Step 1.2 fails (before the Jenkinsfile is available). Changing the Jenkinsfile would allow me to override step 2.2 with no problems, but 1.2 is executed without user/jenkinsfile intervention - it comes directly from the Multi-branch pipeline configuration and is executed on the master (not on a node) without reading the Jenkinsfile (it's a chicken and egg issue) Add Comment
[JIRA] (JENKINS-45228) Git merge requires authentication in LFS merges, plugin does not authenticate the git merge command
Title: Message Title
Andrey Babushkin edited a comment on JENKINS-45228
Re: Git merge requires authentication in LFS merges, plugin does not authenticate the git merge command
I have the same situation [~viviendelmon] has.[~whitty] it seems that the only workaround is to add direct 'sh' steps with direct 'git' invocation as [~asmorkalov] suggested here :{code:java}sshagent(credentials: [account]) { sh "git clone ${repo_url} ." sh "git lfs install" sh "git checkout ${source_branch}" sh "git checkout ${target_branch}" sh "git merge --no-ff ${source_branch}" sh "git submodule update --init --recursive" sh "git lfs pull"}{code}
Add Comment
This message was sent by Atlassian Jira (v7.11.2#711002-sha1:fdc329d)
--
You received this message because you are subscribed to the Google Groups "Jenkins Issues" group.
To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
[JIRA] (JENKINS-45228) Git merge requires authentication in LFS merges, plugin does not authenticate the git merge command
Title: Message Title Andrey Babushkin commented on JENKINS-45228 Re: Git merge requires authentication in LFS merges, plugin does not authenticate the git merge command I have the same situation Vivien Delmon has. Greg Whiteley it seems that the only workaround is to add direct 'sh' steps with direct 'git' invocation as Alexander Smorkalov suggested here Add Comment This message was sent by Atlassian Jira (v7.11.2#711002-sha1:fdc329d) -- You received this message because you are subscribed to the Google Groups "Jenkins Issues" group. To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
[JIRA] (JENKINS-45228) Git merge requires authentication in LFS merges, plugin does not authenticate the git merge command
Title: Message Title Greg Whiteley commented on JENKINS-45228 Re: Git merge requires authentication in LFS merges, plugin does not authenticate the git merge command I'm seeing this problem specifically on the master, not on a node when it is trying to access the Jenkinsfile so no workaround is possible as this is pre-pipeline. I observe the reverse of Vivien Delmon specifically the issue occurs when LFS files have been added to the target branch (eg master), but are not present on the source branch (the PR branch). This makes sense since the operation is checkout PR branch, then git merge master In my case "Git LFS pull after checkout" is already present. Since this is prior to pipeline I can't see any other possibility for workaround. Any ideas? Add Comment This message was sent by Atlassian Jira (v7.11.2#711002-sha1:fdc329d) -- You received this message because you are subscribed to the Google Groups "Jenkins Issues" group. To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
[JIRA] (JENKINS-45228) Git merge requires authentication in LFS merges, plugin does not authenticate the git merge command
Title: Message Title
Vivien Delmon commented on JENKINS-45228
Re: Git merge requires authentication in LFS merges, plugin does not authenticate the git merge command
I don't know if this additional information may help solving this issue. But in my case, the problem happens only when I am merging a branch where LFS files were added. I mean, it does not fail when some LFS files were added in the target branch but only when they were added in the source branch.
Wiping out workspace first.
Cloning the remote Git repository
Cloning repository git@GitServer:SomeRepository.git
> git init C:\dev\workspace\SomeRepository\R # timeout=10
Fetching upstream changes from git@GitServer:SomeRepository.git
> git --version # timeout=10
using GIT_SSH to set credentials
> git fetch --tags --progress git@GitServer:SomeRepository.git +refs/heads/*:refs/remotes/origin/*
> git config remote.origin.url git@GitServer:SomeRepository.git # timeout=10
> git config --add remote.origin.fetch +refs/heads/*:refs/remotes/origin/* # timeout=10
> git config remote.origin.url git@GitServer:SomeRepository.git # timeout=10
Fetching upstream changes from git@GitServer:SomeRepository.git
using GIT_SSH to set credentials
> git fetch --tags --progress git@GitServer:SomeRepository.git +refs/heads/*:refs/remotes/origin/* +refs/merge-requests/*/head:refs/remotes/origin/merge-requests/*
> git rev-parse "81301a232895e0d241d185b1182e080bdf0a7236^{commit}" # timeout=10
> git branch -a -v --no-abbrev --contains 81301a232895e0d241d185b1182e080bdf0a7236 # timeout=10
Merging Revision 81301a232895e0d241d185b1182e080bdf0a7236 (origin/prepareRelease, origin/merge-requests/5) to origin/master, UserMergeOptions{mergeRemote='origin', mergeTarget='master', mergeStrategy='default', fastForwardMode='--ff'}
> git rev-parse "origin/master^{commit}" # timeout=10
Enabling Git LFS pull
Enabling Git LFS pull
> git config core.sparsecheckout # timeout=10
> git checkout -f origin/master
> git config --get remote.origin.url # timeout=10
using GIT_SSH to set credentials
> git lfs pull origin
> git merge --ff 81301a232895e0d241d185b1182e080bdf0a7236 # timeout=10
Enabling Git LFS pull
Enabling Git LFS pull
> git config core.sparsecheckout # timeout=10
> git checkout -f 81301a232895e0d241d185b1182e080bdf0a7236
> git config --get remote.origin.url # timeout=10
using GIT_SSH to set credentials
> git lfs pull origin
ERROR: Branch not suitable for integration as it does not merge cleanly: Command "git merge --ff 81301a232895e0d241d185b1182e080bdf0a7236" returned status code 128:
stdout: Updating e0c3f35..81301a2stderr: Downloading samples/BigFile (515.04 KB)
Error downloading object: samples/BigFile (cba8e11): Smudge error: Error downloading samples/BigFile (cba8e11334d9db127df2daa04ff942a88191b5785c6abf6142e6e3701cbb68fc): batch request: Permission denied, please try again.
Permission denied, please try again.
Permission denied (publickey,password).: exit status 255Errors logged to C:\dev\workspace\SomeRepository\R\.git\lfs\objects\logs\20180904T101810.8132111.log
Use `git lfs logs last` to view the log.
error: external filter 'git-lfs filter-process' failed
fatal: samples/BigFile: smudge filter lfs failed
[JIRA] (JENKINS-45228) Git merge requires authentication in LFS merges, plugin does not authenticate the git merge command
Title: Message Title Kalle Niemitalo commented on JENKINS-45228 Re: Git merge requires authentication in LFS merges, plugin does not authenticate the git merge command In my case, git merge was run because of pull request discovery in a multibranch project using Bitbucket Branch Source. Perhaps that is why the environment variable in Jenkinsfile did not affect it. I have now disabled pull request discovery so that I won't have to kill processes on agents. Add Comment This message was sent by Atlassian JIRA (v7.3.0#73011-sha1:3c73d0e) -- You received this message because you are subscribed to the Google Groups "Jenkins Issues" group. To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
[JIRA] (JENKINS-45228) Git merge requires authentication in LFS merges, plugin does not authenticate the git merge command
Title: Message Title
Kalle Niemitalo commented on JENKINS-45228
Re: Git merge requires authentication in LFS merges, plugin does not authenticate the git merge command
I verified that the git-lfs process has GIT_ASKPASS=echo in its environment, even though my Jenkinsfile starts like this:
pipeline {
environment {
// Possible workaround for git-merge hanging in Jenkins
// due to repeated Git LFS credential prompts
GIT_ASKPASS = 'false'
}
So, I cannot use that as a workaround. These repeated credential retries are consuming about 80% CPU time of one hardware thread, too.
Add Comment
This message was sent by Atlassian JIRA (v7.3.0#73011-sha1:3c73d0e)
--
You received this message because you are subscribed to the Google Groups "Jenkins Issues" group.
To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
[JIRA] (JENKINS-45228) Git merge requires authentication in LFS merges, plugin does not authenticate the git merge command
Title: Message Title
Kalle Niemitalo commented on JENKINS-45228
Re: Git merge requires authentication in LFS merges, plugin does not authenticate the git merge command
After "git merge" hangs like this and I abort the build via Jenkins, the git-lfs process keeps running on the Windows agent. IIRC, it keeps asking for credentials and running "git credential reject". I didn't check the environment variables of the processes but it seems freshEnv.put("GIT_ASKPASS", "echo"); in launchCommandIn, which is intended to prevent the build from hanging, isn't fulfilling its purpose. I wonder if it should do freshEnv.put("GIT_ASKPASS", "false"); instead; that might make the build at least fail cleanly. I should try changing my Jenkinsfiles to set that.
Add Comment
This message was sent by Atlassian JIRA (v7.3.0#73011-sha1:3c73d0e)
--
You received this message because you are subscribed to the Google Groups "Jenkins Issues" group.
To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
[JIRA] (JENKINS-45228) Git merge requires authentication in LFS merges, plugin does not authenticate the git merge command
Title: Message Title Emil Styrke commented on JENKINS-45228 Re: Git merge requires authentication in LFS merges, plugin does not authenticate the git merge command I am getting bitten by this as well now, in git plugin version 3.8.0: Checking out git http:///.git http:///.git into /var/lib/jenkins/workspace/_PR-109-ZFFDADYA3J6CFXJFIAHHACXI6SU7323HOW62DUSZOKSYPGIJTAKA@script to read Jenkinsfile > git rev-parse --is-inside-work-tree # timeout=10 Fetching changes from 2 remote Git repositories > git config remote.origin.url http:///.git # timeout=10 Fetching upstream changes from http:///.git > git --version # timeout=10 using GIT_ASKPASS to set credentials Jenkins @ Bitbucket > git fetch --tags --progress http:///.git +refs/pull-requests/109/from:refs/remotes/origin/PR-109 > git config remote.upstream.url http:///.git # timeout=10 Fetching upstream changes from http:///.git using GIT_ASKPASS to set credentials Jenkins @ Bitbucket > git fetch --tags --progress http:///.git +refs/heads/release/VER_4-17:refs/remotes/upstream/release/VER_4-17 Merging remotes/upstream/release/VER_4-17 commit 9e203652b8fabc0062fd8a6c8f0f6c3d30d96dcf into PR head commit 366c0da12a0856d527cf40b87d61ed9b30662283 Enabling Git LFS pull > git config core.sparsecheckout # timeout=10 > git checkout -f 366c0da12a0856d527cf40b87d61ed9b30662283 > git config --get remote.origin.url # timeout=10 using GIT_ASKPASS to set credentials Jenkins @ Bitbucket > git lfs pull origin > git merge 9e203652b8fabc0062fd8a6c8f0f6c3d30d96dcf # timeout=10 And the last command hangs until it times out because "GIT_ASKPASS" is set to "echo". Mark Waite, would it be possible to let the "git lfs pull" behavior implementation add the necessary credentials for merge commands? (or alternatively make sure that all relevant LFS objects are pulled before attempting the merge, I guess) Add Comment
