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

Plugin always leads to merge failure (case 12800)

    Details

    • Type: Bug
    • Status: Closed (View Workflow)
    • Priority: Major
    • Resolution: Cannot Reproduce
    • Labels:
      None
    • Environment:
      Jenkins LTS 1.596.1
      pretested-integration-plugin 2.2.1
    • Similar Issues:

      Description

      When the plugin checks out the branches and tries to merge the feature branch to the integration branch, it always outputs "Merge failure" without further information. It happens all the time even with no relevant changes compared to the integration branch. This does not happen when using version 2.2.0. Commit strategy is set to accumulated commits (which is, where the actual change from 2.2.0-> 2.2.1 is).

      Jenkins Configuration:
      Jenkins is hosted on a Windows 8.1 machine where builds and tests are performed as well.
      The build execution is done on the Jenkins server and no build slaves are used. Only git is used as the SCM (with only one repository) and the current version (1.9.5) of git is used. The cmd version of the git.exe is used (in order to work with ssh properly) according to these instructions: http://opensourcetester.co.uk/2013/06/28/jenkins-windows-ssh/

        Attachments

          Activity

          janh Jan Hirzel created issue -
          madsnielsen Mads Nielsen made changes -
          Field Original Value New Value
          Summary Plugin always leads to merge failure Plugin always leads to merge failure (case 12800)
          janh Jan Hirzel made changes -
          Description When the plugin checks out the branches and tries to merge the feature branch to the integration branch, it always outputs "Merge failure" without further information. It happens all the time even with no relevant changes compared to the integration branch. This does not happen when using version 2.2.0. Commit strategy is set to accumulated commits (which is, where the actual change from 2.2.0-> 2.2.1 is). When the plugin checks out the branches and tries to merge the feature branch to the integration branch, it always outputs "Merge failure" without further information. It happens all the time even with no relevant changes compared to the integration branch. This does not happen when using version 2.2.0. Commit strategy is set to accumulated commits (which is, where the actual change from 2.2.0-> 2.2.1 is).

          Jenkins Configuration:
          Jenkins is hosted on a Windows 8.1 machine where builds and tests are performed as well.
          The build execution is done on the Jenkins server and no build slaves are used. Only git is used as the SCM (with only one repository) and the current version (1.9.5) of git is used. The cmd version of the git.exe is used (in order to work with ssh properly) according to these instructions: http://opensourcetester.co.uk/2013/06/28/jenkins-windows-ssh/
          janh Jan Hirzel made changes -
          Attachment log.txt [ 28721 ]
          bue Bue Petersen made changes -
          Status Open [ 1 ] In Progress [ 3 ]
          bue Bue Petersen made changes -
          Status In Progress [ 3 ] Resolved [ 5 ]
          Resolution Cannot Reproduce [ 5 ]
          bue Bue Petersen made changes -
          Status Resolved [ 5 ] Closed [ 6 ]
          Assignee Praqma Support [ praqma ] Bue Petersen [ bue ]
          rtyler R. Tyler Croy made changes -
          Workflow JNJira [ 161514 ] JNJira + In-Review [ 208504 ]

            People

            • Assignee:
              bue Bue Petersen
              Reporter:
              janh Jan Hirzel
            • Votes:
              0 Vote for this issue
              Watchers:
              3 Start watching this issue

              Dates

              • Created:
                Updated:
                Resolved: