-
Bug
-
Resolution: Fixed
-
Major
-
Jenkins 2.53 git-plugin 3.2
Upgrading the git plugin to version 3.2 broke our pipeline build that depends on submodules.
The build complains about not being able to find merge points against old tags. This appears to be related to the PR for https://issues.jenkins-ci.org/browse/JENKINS-9713
https://github.com/jenkinsci/git-plugin/pull/340
This appears to be the pertinent part of the logs
*14:05:51* > git tag -l # timeout=10
*14:05:52* > git rev-parse refs/tags/cookbook-site-imported-sudo-2.7.1^\{commit} # timeout=10
*14:05:52* > git rev-parse refs/tags/v0.2.0-posthackerati^\{commit} # timeout=10
*14:05:52* > git rev-parse refs/tags/v0.3.0-alpha^\{commit} # timeout=10
*14:05:52* > git rev-parse refs/tags/old-product-system^\{commit} # timeout=10
*14:05:52* > git rev-parse refs/tags/cookbook-site-imported-td-agent-1daa7273d4921986ecf4efc71340c101493df611^\{commit} # timeout=10
*14:05:52* > git rev-parse refs/tags/cookbook-site-imported-users-1.7.0^\{commit} # timeout=10
*14:05:52* > git rev-parse refs/tags/v0.2.9-prealpha-talis^\{commit} # timeout=10
*14:05:52* > git rev-parse refs/tags/demo-stable-preblink^\{commit} # timeout=10
*14:05:52* > git rev-parse refs/tags/v0.3.5-chef-from-scratch-works^\{commit} # timeout=10
*14:05:52* > git rev-parse refs/tags/stats-elasticsearch-being-replaced-by-redshift^\{commit} # timeout=10
[Pipeline] }
[Pipeline] // stage
[Pipeline] }
[Pipeline] // wrap
[Pipeline] }
[Pipeline] // timestamps
[Pipeline] }
[Pipeline] // node
[Pipeline] End of Pipeline
hudson.plugins.git.GitException: Error computing merge base
at hudson.plugins.git.util.GitUtils.filterTipBranches(GitUtils.java:213)
at
[JENKINS-43308] doGenerateSubmoduleConfigurations causes merge error for non-existent tags
| Description |
Original:
Upgrading the git plugin to version 3.2 broke our pipeline build that depends on submodules. The build complains about not being able to find merge points against old tags. This appears to be related to the PR for https://issues.jenkins-ci.org/browse/JENKINS-9713 [https://github.com/jenkinsci/git-plugin/pull/340] This appears to be the pertinent part of the logs *14:05:51* > git tag -l # timeout=10*14:05:52* > git rev-parse refs/tags/cookbook-site-imported-sudo-2.7.1^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/v0.2.0-posthackerati^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/v0.3.0-alpha^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/old-product-system^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/cookbook-site-imported-td-agent-1daa7273d4921986ecf4efc71340c101493df611^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/cookbook-site-imported-users-1.7.0^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/v0.2.9-prealpha-talis^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/demo-stable-preblink^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/v0.3.5-chef-from-scratch-works^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/stats-elasticsearch-being-replaced-by-redshift^\{commit} # timeout=10 [Pipeline] } [Pipeline] // stage [Pipeline] } [Pipeline] // wrap [Pipeline] } [Pipeline] // timestamps [Pipeline] } [Pipeline] // node [Pipeline] End of Pipeline hudson.plugins.git.GitException: Error computing merge base at hudson.plugins.git.util.GitUtils.filterTipBranches(GitUtils.java:213) at |
New:
Upgrading the git plugin to version 3.2 broke our pipeline build that depends on submodules. The build complains about not being able to find merge points against old tags. This appears to be related to the PR for https://issues.jenkins-ci.org/browse/JENKINS-9713 [https://github.com/jenkinsci/git-plugin/pull/340] This appears to be the pertinent part of the logs {quote}*14:05:51* > git tag -l # timeout=10*14:05:52* > git rev-parse refs/tags/cookbook-site-imported-sudo-2.7.1^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/v0.2.0-posthackerati^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/v0.3.0-alpha^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/old-product-system^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/cookbook-site-imported-td-agent-1daa7273d4921986ecf4efc71340c101493df611^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/cookbook-site-imported-users-1.7.0^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/v0.2.9-prealpha-talis^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/demo-stable-preblink^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/v0.3.5-chef-from-scratch-works^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/stats-elasticsearch-being-replaced-by-redshift^\{commit} # timeout=10 [Pipeline] } [Pipeline] // stage [Pipeline] } [Pipeline] // wrap [Pipeline] } [Pipeline] // timestamps [Pipeline] } [Pipeline] // node [Pipeline] End of Pipeline hudson.plugins.git.GitException: Error computing merge base at hudson.plugins.git.util.GitUtils.filterTipBranches(GitUtils.java:213) at{quote} |
| Description |
Original:
Upgrading the git plugin to version 3.2 broke our pipeline build that depends on submodules. The build complains about not being able to find merge points against old tags. This appears to be related to the PR for https://issues.jenkins-ci.org/browse/JENKINS-9713 [https://github.com/jenkinsci/git-plugin/pull/340] This appears to be the pertinent part of the logs {quote}*14:05:51* > git tag -l # timeout=10*14:05:52* > git rev-parse refs/tags/cookbook-site-imported-sudo-2.7.1^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/v0.2.0-posthackerati^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/v0.3.0-alpha^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/old-product-system^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/cookbook-site-imported-td-agent-1daa7273d4921986ecf4efc71340c101493df611^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/cookbook-site-imported-users-1.7.0^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/v0.2.9-prealpha-talis^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/demo-stable-preblink^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/v0.3.5-chef-from-scratch-works^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/stats-elasticsearch-being-replaced-by-redshift^\{commit} # timeout=10 [Pipeline] } [Pipeline] // stage [Pipeline] } [Pipeline] // wrap [Pipeline] } [Pipeline] // timestamps [Pipeline] } [Pipeline] // node [Pipeline] End of Pipeline hudson.plugins.git.GitException: Error computing merge base at hudson.plugins.git.util.GitUtils.filterTipBranches(GitUtils.java:213) at{quote} |
New:
Upgrading the git plugin to version 3.2 broke our pipeline build that depends on submodules. The build complains about not being able to find merge points against old tags. This appears to be related to the PR for https://issues.jenkins-ci.org/browse/JENKINS-9713 [https://github.com/jenkinsci/git-plugin/pull/340] This appears to be the pertinent part of the logs {{*14:05:51* > git tag -l # timeout=10*14:05:52* > git rev-parse refs/tags/cookbook-site-imported-sudo-2.7.1^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/v0.2.0-posthackerati^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/v0.3.0-alpha^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/old-product-system^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/cookbook-site-imported-td-agent-1daa7273d4921986ecf4efc71340c101493df611^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/cookbook-site-imported-users-1.7.0^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/v0.2.9-prealpha-talis^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/demo-stable-preblink^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/v0.3.5-chef-from-scratch-works^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/stats-elasticsearch-being-replaced-by-redshift^\{commit} # timeout=10 [Pipeline] } [Pipeline] // stage [Pipeline] } [Pipeline] // wrap [Pipeline] } [Pipeline] // timestamps [Pipeline] } [Pipeline] // node [Pipeline] End of Pipeline hudson.plugins.git.GitException: Error computing merge base at hudson.plugins.git.util.GitUtils.filterTipBranches(GitUtils.java:213) at}} |
| Description |
Original:
Upgrading the git plugin to version 3.2 broke our pipeline build that depends on submodules. The build complains about not being able to find merge points against old tags. This appears to be related to the PR for https://issues.jenkins-ci.org/browse/JENKINS-9713 [https://github.com/jenkinsci/git-plugin/pull/340] This appears to be the pertinent part of the logs {{*14:05:51* > git tag -l # timeout=10*14:05:52* > git rev-parse refs/tags/cookbook-site-imported-sudo-2.7.1^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/v0.2.0-posthackerati^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/v0.3.0-alpha^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/old-product-system^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/cookbook-site-imported-td-agent-1daa7273d4921986ecf4efc71340c101493df611^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/cookbook-site-imported-users-1.7.0^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/v0.2.9-prealpha-talis^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/demo-stable-preblink^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/v0.3.5-chef-from-scratch-works^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/stats-elasticsearch-being-replaced-by-redshift^\{commit} # timeout=10 [Pipeline] } [Pipeline] // stage [Pipeline] } [Pipeline] // wrap [Pipeline] } [Pipeline] // timestamps [Pipeline] } [Pipeline] // node [Pipeline] End of Pipeline hudson.plugins.git.GitException: Error computing merge base at hudson.plugins.git.util.GitUtils.filterTipBranches(GitUtils.java:213) at}} |
New:
Upgrading the git plugin to version 3.2 broke our pipeline build that depends on submodules. The build complains about not being able to find merge points against old tags. This appears to be related to the PR for https://issues.jenkins-ci.org/browse/JENKINS-9713 [https://github.com/jenkinsci/git-plugin/pull/340] This appears to be the pertinent part of the logs {noformat} *14:05:51* > git tag -l # timeout=10*14:05:52* > git rev-parse refs/tags/cookbook-site-imported-sudo-2.7.1^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/v0.2.0-posthackerati^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/v0.3.0-alpha^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/old-product-system^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/cookbook-site-imported-td-agent-1daa7273d4921986ecf4efc71340c101493df611^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/cookbook-site-imported-users-1.7.0^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/v0.2.9-prealpha-talis^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/demo-stable-preblink^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/v0.3.5-chef-from-scratch-works^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/stats-elasticsearch-being-replaced-by-redshift^\{commit} # timeout=10 [Pipeline] } [Pipeline] // stage [Pipeline] } [Pipeline] // wrap [Pipeline] } [Pipeline] // timestamps [Pipeline] } [Pipeline] // node [Pipeline] End of Pipeline hudson.plugins.git.GitException: Error computing merge base at hudson.plugins.git.util.GitUtils.filterTipBranches(GitUtils.java:213) at {noformat} |
| Description |
Original:
Upgrading the git plugin to version 3.2 broke our pipeline build that depends on submodules. The build complains about not being able to find merge points against old tags. This appears to be related to the PR for https://issues.jenkins-ci.org/browse/JENKINS-9713 [https://github.com/jenkinsci/git-plugin/pull/340] This appears to be the pertinent part of the logs {noformat} *14:05:51* > git tag -l # timeout=10*14:05:52* > git rev-parse refs/tags/cookbook-site-imported-sudo-2.7.1^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/v0.2.0-posthackerati^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/v0.3.0-alpha^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/old-product-system^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/cookbook-site-imported-td-agent-1daa7273d4921986ecf4efc71340c101493df611^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/cookbook-site-imported-users-1.7.0^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/v0.2.9-prealpha-talis^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/demo-stable-preblink^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/v0.3.5-chef-from-scratch-works^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/stats-elasticsearch-being-replaced-by-redshift^\{commit} # timeout=10 [Pipeline] } [Pipeline] // stage [Pipeline] } [Pipeline] // wrap [Pipeline] } [Pipeline] // timestamps [Pipeline] } [Pipeline] // node [Pipeline] End of Pipeline hudson.plugins.git.GitException: Error computing merge base at hudson.plugins.git.util.GitUtils.filterTipBranches(GitUtils.java:213) at {noformat} |
New:
Upgrading the git plugin to version 3.2 broke our pipeline build that depends on submodules. The build complains about not being able to find merge points against old tags. This appears to be related to the PR for https://issues.jenkins-ci.org/browse/JENKINS-9713 [https://github.com/jenkinsci/git-plugin/pull/340] This appears to be the pertinent part of the logs {noformat} *14:05:51* > git tag -l # timeout=10*14:05:52* > git rev-parse refs/tags/cookbook-site-imported-sudo-2.7.1^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/v0.2.0-posthackerati^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/v0.3.0-alpha^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/old-product-system^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/cookbook-site-imported-td-agent-1daa7273d4921986ecf4efc71340c101493df611^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/cookbook-site-imported-users-1.7.0^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/v0.2.9-prealpha-talis^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/demo-stable-preblink^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/v0.3.5-chef-from-scratch-works^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/stats-elasticsearch-being-replaced-by-redshift^\{commit} # timeout=10 [Pipeline] } [Pipeline] // stage [Pipeline] } [Pipeline] // wrap [Pipeline] } [Pipeline] // timestamps [Pipeline] } [Pipeline] // node [Pipeline] End of Pipeline hudson.plugins.git.GitException: Error computing merge base at hudson.plugins.git.util.GitUtils.filterTipBranches(GitUtils.java:213) at {noformat} |
| Description |
Original:
Upgrading the git plugin to version 3.2 broke our pipeline build that depends on submodules. The build complains about not being able to find merge points against old tags. This appears to be related to the PR for https://issues.jenkins-ci.org/browse/JENKINS-9713 [https://github.com/jenkinsci/git-plugin/pull/340] This appears to be the pertinent part of the logs {noformat} *14:05:51* > git tag -l # timeout=10*14:05:52* > git rev-parse refs/tags/cookbook-site-imported-sudo-2.7.1^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/v0.2.0-posthackerati^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/v0.3.0-alpha^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/old-product-system^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/cookbook-site-imported-td-agent-1daa7273d4921986ecf4efc71340c101493df611^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/cookbook-site-imported-users-1.7.0^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/v0.2.9-prealpha-talis^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/demo-stable-preblink^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/v0.3.5-chef-from-scratch-works^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/stats-elasticsearch-being-replaced-by-redshift^\{commit} # timeout=10 [Pipeline] } [Pipeline] // stage [Pipeline] } [Pipeline] // wrap [Pipeline] } [Pipeline] // timestamps [Pipeline] } [Pipeline] // node [Pipeline] End of Pipeline hudson.plugins.git.GitException: Error computing merge base at hudson.plugins.git.util.GitUtils.filterTipBranches(GitUtils.java:213) at {noformat} |
New:
Upgrading the git plugin to version 3.2 broke our pipeline build that depends on submodules. The build complains about not being able to find merge points against old tags. This appears to be related to the PR for https://issues.jenkins-ci.org/browse/JENKINS-9713 [https://github.com/jenkinsci/git-plugin/pull/340] This appears to be the pertinent part of the logs {noformat} *14:05:51* > git tag -l # timeout=10 *14:05:52* > git rev-parse refs/tags/cookbook-site-imported-sudo-2.7.1^\{commit} # timeout=10 *14:05:52* > git rev-parse refs/tags/v0.2.0-posthackerati^\{commit} # timeout=10 *14:05:52* > git rev-parse refs/tags/v0.3.0-alpha^\{commit} # timeout=10 *14:05:52* > git rev-parse refs/tags/old-product-system^\{commit} # timeout=10 *14:05:52* > git rev-parse refs/tags/cookbook-site-imported-td-agent-1daa7273d4921986ecf4efc71340c101493df611^\{commit} # timeout=10 *14:05:52* > git rev-parse refs/tags/cookbook-site-imported-users-1.7.0^\{commit} # timeout=10 *14:05:52* > git rev-parse refs/tags/v0.2.9-prealpha-talis^\{commit} # timeout=10 *14:05:52* > git rev-parse refs/tags/demo-stable-preblink^\{commit} # timeout=10 *14:05:52* > git rev-parse refs/tags/v0.3.5-chef-from-scratch-works^\{commit} # timeout=10 *14:05:52* > git rev-parse refs/tags/stats-elasticsearch-being-replaced-by-redshift^\{commit} # timeout=10 [Pipeline] } [Pipeline] // stage [Pipeline] } [Pipeline] // wrap [Pipeline] } [Pipeline] // timestamps [Pipeline] } [Pipeline] // node [Pipeline] End of Pipeline hudson.plugins.git.GitException: Error computing merge base at hudson.plugins.git.util.GitUtils.filterTipBranches(GitUtils.java:213) at {noformat} |
The use case is that we have a master repo called `system` which we use to run a full system integration test. It has each of our project repos as a submodule, and whenever a PR runs against any of our projects it kicks off a build of the system repo.
The system repo runs with a Jenkinsfile. It is the 'checkout' command that is failing-
checkout([
$class: 'GitSCM',
branches: scm.branches,
doGenerateSubmoduleConfigurations: true,
extensions: scm.extensions + [[
$class: 'SubmoduleOption',
recursiveSubmodules: true,
parentCredentials: true,
trackingSubmodules: true
]],
userRemoteConfigs: scm.userRemoteConfigs
])
The tags in question are from the submodules. The tags listed in the error message from the ticket are from several years ago in our `backend` repository. Deleting the tags got the build to move to the next submodule. (it still failed, that one also had tags and we were actually using those tags!). I don't really understand what is going on with the git command here to answer more intelligently, but would be happy to answer any questions you may have.
Final note, reverting back to git-plugin 3.1.0 resolved the issue for us.
What settings are configured that are causing a merge? As far as I know, the default settings for a job perform no merge, and you have no extensions in that job definition which would cause a merge.
| Assignee | Original: Mark Waite [ markewaite ] |
Sorry to hear that it broke your build. Can you provide a job definition or the necessary steps which show the problem to someone who doesn't have access to your Jenkins server?
Could you expand your description of the use case so that I can better understand it? You say that you depend on submodules, and that it is not able to find merge points against old tags. Are those tags inside the submodule repository, or are they in the repository which references the submodules?
Does your job definition include any settings which would prevent fetching of tags from the remote repository?