• Icon: Bug Bug
    • Resolution: Fixed
    • Icon: Critical Critical
    • None
    • windows x64
      java 1.7.0_17

      When git-plugin is configured to use the integration branch feature and the there are multiple candidate revisions and the merge fails an endless number of builds are scheduled. As you can see from the log below and new build is scheduled before the merge fails. And the new scheduled build will schedule a new build and fail for the exact same reason.... Endless loop....

      The build is configured to merge all branches matching /order/* and /bug/* into project/man/integration464 branch

      Here's the log from jenkins build:

      15:03:52 Started by an SCM change
      15:03:52 Building on master in workspace C:\Users\.hudson\jobs\Test Git integration branch\workspace
      15:03:52 Checkout:workspace / C:\Users\.hudson\jobs\Test Git integration branch\workspace - hudson.remoting.LocalChannel@21777ce4
      15:03:52 Using strategy: Default
      15:03:52 Last Built Revision: Revision e1a5d142152e8fbcf6248cbe939d402dcca776d4 (origin/order/148)
      15:03:52 Fetching changes from 1 remote Git repository
      15:03:52 Fetching upstream changes from origin
      15:03:54 Pruning obsolete local branches
      15:03:54 Seen branch in repository origin/HEAD
      15:03:54 Seen branch in repository origin/bug/10825
      15:03:54 Seen branch in repository origin/bug/10827
      15:03:54 Seen branch in repository origin/master
      15:03:54 Seen branch in repository origin/order/148
      15:03:54 Seen branch in repository origin/order/149
      15:03:54 Seen branch in repository origin/order/150
      15:03:54 Seen branch in repository origin/order/151
      15:03:54 Seen branch in repository origin/order/152
      15:03:54 Seen branch in repository origin/order/153
      15:03:54 Seen branch in repository origin/project/man/integration464
      15:03:54 Multiple candidate revisions
      15:03:54 Scheduling another build to catch up with Test Git integration branch
      15:03:54 Commencing build of Revision 7ca6fe365e8a5eff214456b2b0c7575bc8ec2da8 (origin/order/153)
      15:03:54 Merging Revision 7ca6fe365e8a5eff214456b2b0c7575bc8ec2da8 (origin/order/153) onto project/man/integration464
      15:03:58 ERROR: Branch not suitable for integration as it does not merge cleanly
      15:03:58 [WARNINGS] Parsing warnings in console log with parser Java Compiler (javac)
      15:03:58 Archiving artifacts
      15:03:58 Recording fingerprints
      15:03:58 Description set:
      15:03:58 Build did not succeed and the project is configured to only push after a successful build, so no pushing will occur.
      15:03:58 Sending e-mails to: xx@xxxxxxx.com
      15:03:59 Finished: FAILURE

          [JENKINS-17653] git-plugin cause endless number of builds

          Jenkins GIT client plugin -> version 1.0.5
          Jenkins GIT plugin -> version 1.3.0

          Mattias Andersson added a comment - Jenkins GIT client plugin -> version 1.0.5 Jenkins GIT plugin -> version 1.3.0

          Tim Snyder added a comment -

          I think this may be fixed with the next versions of git-plugin and git-client-plugin.

          See the following:

          Both have been merged into master of their respective repository. If you have trouble building them, I have locally built hpi's that I could share.

          Tim Snyder added a comment - I think this may be fixed with the next versions of git-plugin and git-client-plugin. See the following: https://github.com/jenkinsci/git-plugin/pull/148 https://github.com/jenkinsci/git-client-plugin/pull/9 Both have been merged into master of their respective repository. If you have trouble building them, I have locally built hpi's that I could share.

          I wouldn't mind if you would make the hpi available because I have no jenkins plugin development environment. If so I could probably squeeze in some time to verify the fix on Friday.

          Mattias Andersson added a comment - I wouldn't mind if you would make the hpi available because I have no jenkins plugin development environment. If so I could probably squeeze in some time to verify the fix on Friday.

          Mark Waite added a comment -

          The git-client-plugin 1.0.6 and git-plugin 1.4.0 should be available from the usual download site soon with those submissions.

          Mark Waite added a comment - The git-client-plugin 1.0.6 and git-plugin 1.4.0 should be available from the usual download site soon with those submissions.

            ndeloof Nicolas De Loof
            man_caleo Mattias Andersson
            Votes:
            2 Vote for this issue
            Watchers:
            4 Start watching this issue

              Created:
              Updated:
              Resolved: