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

Plugin always leads to merge failure (case 12800)

    XMLWordPrintable

    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

          Hide
          bue Bue Petersen added a comment -

          Thanks, I will get back to you with instruction on how to get more logging.

          I'm investigating a regressions issue, possible related to this issue where the plugin hangs. It seems, for now to be a problem in the combination of plugin v. 2.2.1 and Jenkins LTS from a certain version.

          Show
          bue Bue Petersen added a comment - Thanks, I will get back to you with instruction on how to get more logging. I'm investigating a regressions issue, possible related to this issue where the plugin hangs. It seems, for now to be a problem in the combination of plugin v. 2.2.1 and Jenkins LTS from a certain version.
          Hide
          bue Bue Petersen added a comment -

          Reference to other issue: JENKINS-27328

          Show
          bue Bue Petersen added a comment - Reference to other issue: JENKINS-27328
          Hide
          bue Bue Petersen added a comment -

          Can you try to enable the logging plugin to get more information from logging on the slaves?

          https://wiki.jenkins-ci.org/display/JENKINS/Logging+Plugin

          It will catch your logs on the slaves.

          Logging specifically on the pretested integration plugin, use this namespace: org.jenkinsci.plugins.pretestedintegration

          It should supply us with more information. If you won't share with community, you can send it to us on support@praqma.net with reference to this case. I will have a look at it.

          For now, you are the only one reporting problems with the merge.

          By the way, here is an example list of git commands used from the plugin - you could try them:

          git checkout -B master origin/master

          git pull origin master

          git merge -m "Accumulated commit of the following from branch 'origin/ready/teamFeature': commit ab22116e7c135b57771c3fe740b5c1c78610df7a Author: john Doe <Joh@praqma.net> Date: Fri Mar 06 02:30:25 2015 +0100 Updated info file 5. time on branch ready/teamFeature commit 126ee365f36cbc991e4feb8d579ceedb9c737875 Author: ReleasePraqma <release@praqma.net> Date: Fri Mar 06 02:30:25 2015 +0100 Merge commit '9aa057053388508f0c353eb56ed6985a3da536bb' into ready/teamFeature commit cbe04ecab067454aadddc4f8943cb14016092ae0 Author: john Doe <Joh@praqma.net> Date: Fri Mar 06 02:30:24 2015 +0100 4. time updating info file on branch ready/teamFeature commit 24365566f7828e9cae95fbbd31e6585b2f6764ed Author: john Doe <Joh@praqma.net> Date: Fri Mar 06 02:30:24 2015 +0100 Updated info file again on branch ready/teamFeature - my first change is about this - my next change is a refactor. commit b77e511955bfdb435a3ff9284c50c7b0aca3bb0a Author: john Doe <Joh@praqma.net> Date: Fri Mar 06 02:30:24 2015 +0100 Updated info file on branch ready/teamFeature " ab22116e7c135b57771c3fe740b5c1c78610df7a --no-ff

          git push origin master

          git push origin :ready/teamFeature

          Show
          bue Bue Petersen added a comment - Can you try to enable the logging plugin to get more information from logging on the slaves? https://wiki.jenkins-ci.org/display/JENKINS/Logging+Plugin It will catch your logs on the slaves. Logging specifically on the pretested integration plugin, use this namespace: org.jenkinsci.plugins.pretestedintegration It should supply us with more information. If you won't share with community, you can send it to us on support@praqma.net with reference to this case. I will have a look at it. For now, you are the only one reporting problems with the merge. By the way, here is an example list of git commands used from the plugin - you could try them: git checkout -B master origin/master git pull origin master git merge -m "Accumulated commit of the following from branch 'origin/ready/teamFeature': commit ab22116e7c135b57771c3fe740b5c1c78610df7a Author: john Doe <Joh@praqma.net> Date: Fri Mar 06 02:30:25 2015 +0100 Updated info file 5. time on branch ready/teamFeature commit 126ee365f36cbc991e4feb8d579ceedb9c737875 Author: ReleasePraqma <release@praqma.net> Date: Fri Mar 06 02:30:25 2015 +0100 Merge commit '9aa057053388508f0c353eb56ed6985a3da536bb' into ready/teamFeature commit cbe04ecab067454aadddc4f8943cb14016092ae0 Author: john Doe <Joh@praqma.net> Date: Fri Mar 06 02:30:24 2015 +0100 4. time updating info file on branch ready/teamFeature commit 24365566f7828e9cae95fbbd31e6585b2f6764ed Author: john Doe <Joh@praqma.net> Date: Fri Mar 06 02:30:24 2015 +0100 Updated info file again on branch ready/teamFeature - my first change is about this - my next change is a refactor. commit b77e511955bfdb435a3ff9284c50c7b0aca3bb0a Author: john Doe <Joh@praqma.net> Date: Fri Mar 06 02:30:24 2015 +0100 Updated info file on branch ready/teamFeature " ab22116e7c135b57771c3fe740b5c1c78610df7a --no-ff git push origin master git push origin :ready/teamFeature
          Hide
          bue Bue Petersen added a comment -

          This issue could be related to JENKINS-27662.

          If we don't get further feedback on this issue, we will resolve as dublicate of JENKINS-27662.

          Show
          bue Bue Petersen added a comment - This issue could be related to JENKINS-27662 . If we don't get further feedback on this issue, we will resolve as dublicate of JENKINS-27662 .
          Hide
          bue Bue Petersen added a comment -

          I think the real problem is the reporting of merge errors from the plugin.

          See JENKINS-27690.

          Show
          bue Bue Petersen added a comment - I think the real problem is the reporting of merge errors from the plugin. See JENKINS-27690 .

            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: