Details

    • Similar Issues:
    • Released As:
      2.5.3

      Description

      Hi,

       

      After updating to the latest version (2.5.1) I get the following error messages immediately and the build fails.

       

      ERROR: Invalid merge hash for pull request 522 : Head and base commits do match merge commit a538d719213e99bb52dc73c2fac2fd3b1375ee1d+7b4572c5176951887e3fd3cf80df30821caed9ec (8f660b9de0bb201869379a428d117866539f4cce)
      Finished: FAILURE

        Attachments

          Issue Links

            Activity

            Hide
            audunhalland Audun Halland added a comment - - edited

            Thank you!

            Scan log:

            ...
            Checking pull request #47

            ‘Jenkinsfile’ found Invalid github merge_commit_sha for pull request 47 : Head and base commits do match merge commit 5729a1e31f5d0691d16801604312de0af03da009+7e881478aa951a0f9caad966907c68c5c058a935 (567c876ca2e53637b53edd7c4eedca77af15aa65), expected head and base 76ff9c62d27d6b60666c08d0686e3100974fd1fe+5729a1e31f5d0691d16801604312de0af03da009 Met criteria Changes detected: PR-47 (5729a1e31f5d0691d16801604312de0af03da009+7e881478aa951a0f9caad966907c68c5c058a935 (567c876ca2e53637b53edd7c4eedca77af15aa65) → 5729a1e31f5d0691d16801604312de0af03da009+7e881478aa951a0f9caad966907c68c5c058a935 (UNKNOWN_MERGE_STATE)) Scheduled build for branch: PR-47

            Build log (it now starts building the pipeline):

            Branch indexing
            21:04:15 Connecting to https://api.github.com using ci@mydomain.com/******
            Invalid github merge_commit_sha for pull request 47 : Head and base commits do match merge commit 5729a1e31f5d0691d16801604312de0af03da009+7e881478aa951a0f9caad966907c68c5c058a935 (567c876ca2e53637b53edd7c4eedca77af15aa65), expected head and base 76ff9c62d27d6b60666c08d0686e3100974fd1fe+5729a1e31f5d0691d16801604312de0af03da009
            Checking out git git@github.com:MyOrganization/my-repo.git into /var/jenkins_home/workspace/my-repo_PR-47@script to read Jenkinsfile
            using credential github-sshkey
            Cloning the remote Git repository
            Cloning with configured refspecs honoured and without tags
            Cloning repository git@github.com:MyOrganization/my-repo.git
            {{ > git init /var/jenkins_home/workspace/my-repo_PR-47@script # timeout=10}}
            Fetching upstream changes from git@github.com:MyOrganization/my-repo.git
            {{ > git --version # timeout=10}}
            using GIT_SSH to set credentials MyJenkins@github.com SSH key
            {{ > git fetch --no-tags --force --progress git@github.com:MyOrganization/my-repo.git +refs/pull/47/head:refs/remotes/origin/PR-47 +refs/heads/master:refs/remotes/origin/master}}
            {{ > git config remote.origin.url git@github.com:MyOrganization/my-repo.git # timeout=10}}
            {{ > git config --add remote.origin.fetch +refs/pull/47/head:refs/remotes/origin/PR-47 # timeout=10}}
            {{ > git config --add remote.origin.fetch +refs/heads/master:refs/remotes/origin/master # timeout=10}}
            {{ > git config remote.origin.url git@github.com:MyOrganization/my-repo.git # timeout=10}}
            Fetching without tags
            Fetching upstream changes from git@github.com:MyOrganization/my-repo.git
            using GIT_SSH to set credentials MyJenkins@github.com SSH key
            {{ > git fetch --no-tags --force --progress git@github.com:MyOrganization/my-repo.git +refs/pull/47/head:refs/remotes/origin/PR-47 +refs/heads/master:refs/remotes/origin/master}}
            Merging remotes/origin/master commit 7e881478aa951a0f9caad966907c68c5c058a935 into PR head commit 5729a1e31f5d0691d16801604312de0af03da009
            {{ > git config core.sparsecheckout # timeout=10}}
            {{ > git checkout -f 5729a1e31f5d0691d16801604312de0af03da009}}
            {{ > git merge 7e881478aa951a0f9caad966907c68c5c058a935 # timeout=10}}
            {{ > git rev-parse HEAD^ {commit} timeout=10}}
            Merge succeeded, producing 5729a1e31f5d0691d16801604312de0af03da009
            Checking out Revision 5729a1e31f5d0691d16801604312de0af03da009 (PR-47)
            {{ > git config core.sparsecheckout # timeout=10}}
            {{ > git checkout -f 5729a1e31f5d0691d16801604312de0af03da009}}
            Commit message: "Merge branch 'master' of https://github.com/MyOrganization/my-repo into feature/search-api-new-branch"
            First time build. Skipping changelog.
            Running in Durability level: MAX_SURVIVABILITY
            Loading library jenkins-pipeline-libraries@master
            Examining MyOrganization/jenkins-pipeline-libraries
            Attempting to resolve master as a branch
            Resolved master as branch master at revision 190ac158caf5abb464702aa7515c417f01143052
            using credential github-ci-username-password
            Cloning the remote Git repository
            Cloning with configured refspecs honoured and without tags
            Cloning repository https://github.com/MyOrganization/jenkins-pipeline-libraries.git
            {{ > git init /var/jenkins_home/workspace/my-repo_PR-47@libs/jenkins-pipeline-libraries # timeout=10}}
            Fetching upstream changes from https://github.com/MyOrganization/jenkins-pipeline-libraries.git
            {{ > git --version timeout=10}}
            {{using GIT_ASKPASS to set credentials }}
            {{ > git fetch --no-tags --force --progress https://github.com/MyOrganization/jenkins-pipeline-libraries.git +refs/heads/master:refs/remotes/origin/master}}
            {{ > git config remote.origin.url https://github.com/MyOrganization/jenkins-pipeline-libraries.git # timeout=10}}
            {{ > git config --add remote.origin.fetch +refs/heads/master:refs/remotes/origin/master timeout=10}}
            {{ > git config remote.origin.url https://github.com/MyOrganization/jenkins-pipeline-libraries.git # timeout=10}}
            Fetching without tags
            Fetching upstream changes from https://github.com/MyOrganization/jenkins-pipeline-libraries.git
            {{using GIT_ASKPASS to set credentials }}
            {{ > git fetch --no-tags --force --progress https://github.com/MyOrganization/jenkins-pipeline-libraries.git +refs/heads/master:refs/remotes/origin/master}}
            Checking out Revision 190ac158caf5abb464702aa7515c417f01143052 (master)
            {{ > git config core.sparsecheckout # timeout=10}}
            {{ > git checkout -f 190ac158caf5abb464702aa7515c417f01143052}}
            Commit message: "Fix typo"
            First time build. Skipping changelog.
            [Pipeline] Start of Pipeline
            ........ Lots of stuff .....

            I figure it somehow still believes that 7e88 is master HEAD (based on Merging remotes/origin/master commit 7e881478aa951a0f9caad966907c68c5c058a935 into PR head commit 5729a1e31f5d0691d16801604312de0af03da009). It printed one correct reference to the true master HEAD (76ff) in the 3rd build log line.

            Show
            audunhalland Audun Halland added a comment - - edited Thank you! Scan log: ... Checking pull request #47 ‘Jenkinsfile’ found Invalid github merge_commit_sha for pull request 47 : Head and base commits do match merge commit 5729a1e31f5d0691d16801604312de0af03da009+7e881478aa951a0f9caad966907c68c5c058a935 (567c876ca2e53637b53edd7c4eedca77af15aa65), expected head and base 76ff9c62d27d6b60666c08d0686e3100974fd1fe+5729a1e31f5d0691d16801604312de0af03da009 Met criteria Changes detected: PR-47 (5729a1e31f5d0691d16801604312de0af03da009+7e881478aa951a0f9caad966907c68c5c058a935 (567c876ca2e53637b53edd7c4eedca77af15aa65) → 5729a1e31f5d0691d16801604312de0af03da009+7e881478aa951a0f9caad966907c68c5c058a935 (UNKNOWN_MERGE_STATE)) Scheduled build for branch: PR-47 Build log (it now starts building the pipeline): Branch indexing 21:04:15 Connecting to https://api.github.com using ci@mydomain.com/****** Invalid github merge_commit_sha for pull request 47 : Head and base commits do match merge commit 5729a1e31f5d0691d16801604312de0af03da009+7e881478aa951a0f9caad966907c68c5c058a935 (567c876ca2e53637b53edd7c4eedca77af15aa65), expected head and base 76ff9c62d27d6b60666c08d0686e3100974fd1fe+5729a1e31f5d0691d16801604312de0af03da009 Checking out git git@github.com:MyOrganization/my-repo.git into /var/jenkins_home/workspace/my-repo_PR-47@script to read Jenkinsfile using credential github-sshkey Cloning the remote Git repository Cloning with configured refspecs honoured and without tags Cloning repository git@github.com:MyOrganization/my-repo.git {{ > git init /var/jenkins_home/workspace/my-repo_PR-47@script # timeout=10}} Fetching upstream changes from git@github.com:MyOrganization/my-repo.git {{ > git --version # timeout=10}} using GIT_SSH to set credentials MyJenkins@github.com SSH key {{ > git fetch --no-tags --force --progress git@github.com:MyOrganization/my-repo.git +refs/pull/47/head:refs/remotes/origin/PR-47 +refs/heads/master:refs/remotes/origin/master}} {{ > git config remote.origin.url git@github.com:MyOrganization/my-repo.git # timeout=10}} {{ > git config --add remote.origin.fetch +refs/pull/47/head:refs/remotes/origin/PR-47 # timeout=10}} {{ > git config --add remote.origin.fetch +refs/heads/master:refs/remotes/origin/master # timeout=10}} {{ > git config remote.origin.url git@github.com:MyOrganization/my-repo.git # timeout=10}} Fetching without tags Fetching upstream changes from git@github.com:MyOrganization/my-repo.git using GIT_SSH to set credentials MyJenkins@github.com SSH key {{ > git fetch --no-tags --force --progress git@github.com:MyOrganization/my-repo.git +refs/pull/47/head:refs/remotes/origin/PR-47 +refs/heads/master:refs/remotes/origin/master}} Merging remotes/origin/master commit 7e881478aa951a0f9caad966907c68c5c058a935 into PR head commit 5729a1e31f5d0691d16801604312de0af03da009 {{ > git config core.sparsecheckout # timeout=10}} {{ > git checkout -f 5729a1e31f5d0691d16801604312de0af03da009}} {{ > git merge 7e881478aa951a0f9caad966907c68c5c058a935 # timeout=10}} {{ > git rev-parse HEAD^ {commit} timeout=10}} Merge succeeded, producing 5729a1e31f5d0691d16801604312de0af03da009 Checking out Revision 5729a1e31f5d0691d16801604312de0af03da009 (PR-47) {{ > git config core.sparsecheckout # timeout=10}} {{ > git checkout -f 5729a1e31f5d0691d16801604312de0af03da009}} Commit message: "Merge branch 'master' of https://github.com/MyOrganization/my-repo into feature/search-api-new-branch" First time build. Skipping changelog. Running in Durability level: MAX_SURVIVABILITY Loading library jenkins-pipeline-libraries@master Examining MyOrganization/jenkins-pipeline-libraries Attempting to resolve master as a branch Resolved master as branch master at revision 190ac158caf5abb464702aa7515c417f01143052 using credential github-ci-username-password Cloning the remote Git repository Cloning with configured refspecs honoured and without tags Cloning repository https://github.com/MyOrganization/jenkins-pipeline-libraries.git {{ > git init /var/jenkins_home/workspace/my-repo_PR-47@libs/jenkins-pipeline-libraries # timeout=10}} Fetching upstream changes from https://github.com/MyOrganization/jenkins-pipeline-libraries.git {{ > git --version timeout=10}} {{using GIT_ASKPASS to set credentials }} {{ > git fetch --no-tags --force --progress https://github.com/MyOrganization/jenkins-pipeline-libraries.git +refs/heads/master:refs/remotes/origin/master}} {{ > git config remote.origin.url https://github.com/MyOrganization/jenkins-pipeline-libraries.git # timeout=10}} {{ > git config --add remote.origin.fetch +refs/heads/master:refs/remotes/origin/master timeout=10}} {{ > git config remote.origin.url https://github.com/MyOrganization/jenkins-pipeline-libraries.git # timeout=10}} Fetching without tags Fetching upstream changes from https://github.com/MyOrganization/jenkins-pipeline-libraries.git {{using GIT_ASKPASS to set credentials }} {{ > git fetch --no-tags --force --progress https://github.com/MyOrganization/jenkins-pipeline-libraries.git +refs/heads/master:refs/remotes/origin/master}} Checking out Revision 190ac158caf5abb464702aa7515c417f01143052 (master) {{ > git config core.sparsecheckout # timeout=10}} {{ > git checkout -f 190ac158caf5abb464702aa7515c417f01143052}} Commit message: "Fix typo" First time build. Skipping changelog. [Pipeline] Start of Pipeline ........ Lots of stuff ..... I figure it somehow still believes that 7e88 is master HEAD (based on Merging remotes/origin/master commit 7e881478aa951a0f9caad966907c68c5c058a935 into PR head commit 5729a1e31f5d0691d16801604312de0af03da009 ). It printed one correct reference to the true master HEAD ( 76ff ) in the 3rd build log line.
            Hide
            audunhalland Audun Halland added a comment -

            Sorry, I had some formatting problems pasting the logs into the previous comment.

            Show
            audunhalland Audun Halland added a comment - Sorry, I had some formatting problems pasting the logs into the previous comment.
            Hide
            bitwiseman Liam Newman added a comment -

            Audun Halland
            Formatting: no problem.
            Yes, one part of Jenkins thinks that definitely believes that the head of master is 7e88, when it is actually 76ff. But it is unclear how that is happening.

            It sounds like the patch has unblocked you. I'm working on finalizing a new version that includes this change.

            Show
            bitwiseman Liam Newman added a comment - Audun Halland Formatting: no problem. Yes, one part of Jenkins thinks that definitely believes that the head of master is 7e88 , when it is actually 76ff . But it is unclear how that is happening. It sounds like the patch has unblocked you. I'm working on finalizing a new version that includes this change.
            Hide
            bitwiseman Liam Newman added a comment -

            Audun Halland
            v2.5.3 should be out in the next day or so. If you want to help improve the quality please try this new patch:
            https://repo.jenkins-ci.org/incrementals/org/jenkins-ci/plugins/github-branch-source/2.5.3-rc840.185f1729c3a6/

            Show
            bitwiseman Liam Newman added a comment - Audun Halland v2.5.3 should be out in the next day or so. If you want to help improve the quality please try this new patch: https://repo.jenkins-ci.org/incrementals/org/jenkins-ci/plugins/github-branch-source/2.5.3-rc840.185f1729c3a6/
            Hide
            audunhalland Audun Halland added a comment -

            Thanks, excited to try it out. Though our famous PR-47 is already long gone, I'll be sure to keep my eyes open for failing PRs in the future!

            Thank you again for improving Jenkins and for great support on this issue!

            Show
            audunhalland Audun Halland added a comment - Thanks, excited to try it out. Though our famous PR-47 is already long gone, I'll be sure to keep my eyes open for failing PRs in the future! Thank you again for improving Jenkins and for great support on this issue!

              People

              • Assignee:
                bitwiseman Liam Newman
                Reporter:
                nickez Niklas Claesson
              • Votes:
                1 Vote for this issue
                Watchers:
                4 Start watching this issue

                Dates

                • Created:
                  Updated:
                  Resolved: