Uploaded image for project: 'Jenkins'
  1. Jenkins
  2. JENKINS-5005

Do not attempt to publish if this is a matrix run

    XMLWordPrintable

    Details

    • Type: Patch
    • Status: Closed (View Workflow)
    • Priority: Critical
    • Resolution: Fixed
    • Component/s: git-plugin
    • Labels:
      None
    • Similar Issues:

      Description

      If "Push Merges back to origin" is turned on in a matrix configuration each child will try to push to the origin independently. Aside from the problem that a change will be pushed out if it succeeds on any rather than all configurations, the push for all but the first child to succeed will most likely fail (each child has its own merge commit which will conflict with each other), causing the run to appear to have failed.

      This patch solves both problems by causing the push to only occur in the parent build. It is dependent on issue #5002.

      This may not be the best solution to the problem. Since each child generates its own merge commit, there may be discrepancies between merges generated on different slaves if they have different versions of git. A better solution may be to have the parent generate a pack containing the merge commit which is passed to all children.

        Attachments

          Issue Links

            Activity

            Show
            kohsuke Kohsuke Kawaguchi added a comment - Fixed in https://github.com/hudson/Hudson-GIT-plugin/commit/021e36e25bb69c16dcdc8926461d23e6989afbff toward 1.1.4.
            Hide
            dogfood dogfood added a comment -

            Integrated in plugins_hudson-git-plugin #47
            [FIXED JENKINS-5005] for Matrix projects, push only at the end of the whole thing, not at the configuration build.

            Kohsuke Kawaguchi :
            Files :

            • src/main/java/hudson/plugins/git/GitPublisher.java
            Show
            dogfood dogfood added a comment - Integrated in plugins_hudson-git-plugin #47 [FIXED JENKINS-5005] for Matrix projects, push only at the end of the whole thing, not at the configuration build. Kohsuke Kawaguchi : Files : src/main/java/hudson/plugins/git/GitPublisher.java

              People

              • Assignee:
                jbq jbq
                Reporter:
                pcc pcc
              • Votes:
                0 Vote for this issue
                Watchers:
                0 Start watching this issue

                Dates

                • Created:
                  Updated:
                  Resolved: