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

Revision state returned by Git SCM step is incorrect

    XMLWordPrintable

    Details

    • Type: Bug
    • Status: Closed (View Workflow)
    • Priority: Minor
    • Resolution: Duplicate
    • Component/s: git-plugin, scm-api-plugin
    • Labels:
      None
    • Environment:
      Platform: Windows
      Jenkins Version: 2.121.1
      Git Plugin: 3.9.1
      Git Client: 2.7.2
      SCM API Plugin: 2.2.7
    • Similar Issues:
    • Released As:
      git plugin 4.7.0 released 17 Mar 2021

      Description

      When using a pipeline script from SCM which checks out a different revision, the checkout step returns the GIT_COMMIT of the original checkout.

      I see this manifested in my multibranch pipeline jobs, but it is best demonstrated by a simple parameterised pipeline. The job is configured with "refs/heads/master" as the branch specifier and no branching in the repository is required to reproduce the problem.

      The job has a single "TAG" parameter, providing the tag to be checked out by the pipeline:

      pipeline
      {
          agent any
          environment
          {
              git_tool = tool(name: 'Default', type: 'git')
          }
          options
          {
              skipDefaultCheckout()
          }
          stages
          {
              stage('Checkout')
              {
                  steps
                  {
                      script
                      {
                          def buildTag = env.TAG
                          echo "Building against tag '${buildTag}'"
      
                          def newScm = [$class: 'GitSCM', userRemoteConfigs: scm.userRemoteConfigs, branches: [[name: "refs/tags/${buildTag}"]]]
      
                          def checkoutDetails = checkout scm: newScm, poll: false, changelog: false
      
                          echo "checkout scm returned SHA = ${checkoutDetails.GIT_COMMIT}"
                          bat """git status"""
                      }
                  }
              }
          }
      }
      

      When run with a tag at the HEAD of the specified branch (master) we see the returned SHA is as expected:

      Building against tag 'tag3'
      [Pipeline] checkout
       > C:\Program Files\Git\cmd\git.exe rev-parse --is-inside-work-tree # timeout=120
      Fetching changes from the remote Git repository
       > C:\Program Files\Git\cmd\git.exe config remote.origin.url git@github.aus.thenational.com:P640806/jenkins_testing.git # timeout=120
      Fetching upstream changes from git@github.aus.thenational.com:P640806/jenkins_testing.git
       > C:\Program Files\Git\cmd\git.exe --version # timeout=120
      using GIT_SSH to set credentials 
       > C:\Program Files\Git\cmd\git.exe fetch --tags --progress git@github.aus.thenational.com:P640806/jenkins_testing.git +refs/heads/*:refs/remotes/origin/*
       > C:\Program Files\Git\cmd\git.exe rev-parse "refs/tags/tag3^{commit}" # timeout=120
       > C:\Program Files\Git\cmd\git.exe rev-parse "refs/remotes/origin/refs/tags/tag3^{commit}" # timeout=120
      Checking out Revision e03409cea735e7353e421551c6bd5963f436c38a (refs/tags/tag3)
       > C:\Program Files\Git\cmd\git.exe config core.sparsecheckout # timeout=120
       > C:\Program Files\Git\cmd\git.exe checkout -f e03409cea735e7353e421551c6bd5963f436c38a
      Commit message: "Removed env.GIT_COMMIT usage"
      [Pipeline] echo
      checkout scm returned SHA = e03409cea735e7353e421551c6bd5963f436c38a
      [Pipeline] bat
      [test_scm_issue] Running batch script
      
      d:\jenkins\ws\test_scm_issue>git status 
      HEAD detached at e03409c
      nothing to commit, working tree clean
      

      If an additional commit is added to master (so the tag is no longer at the HEAD), we see the correct revision (e03409c) is checked out, however the revision state returned by the checkout step is the new HEAD of master (5e70b9e903582cd1055e60b819c6f2f09f01aee7):

      Building against tag 'tag3'
      [Pipeline] checkout
       > C:\Program Files\Git\cmd\git.exe rev-parse --is-inside-work-tree # timeout=120
      Fetching changes from the remote Git repository
       > C:\Program Files\Git\cmd\git.exe config remote.origin.url git@github.aus.thenational.com:P640806/jenkins_testing.git # timeout=120
      Fetching upstream changes from git@github.aus.thenational.com:P640806/jenkins_testing.git
       > C:\Program Files\Git\cmd\git.exe --version # timeout=120
      using GIT_SSH to set credentials 
       > C:\Program Files\Git\cmd\git.exe fetch --tags --progress git@github.aus.thenational.com:P640806/jenkins_testing.git +refs/heads/*:refs/remotes/origin/*
       > C:\Program Files\Git\cmd\git.exe rev-parse "refs/tags/tag3^{commit}" # timeout=120
       > C:\Program Files\Git\cmd\git.exe rev-parse "refs/remotes/origin/refs/tags/tag3^{commit}" # timeout=120
      Checking out Revision e03409cea735e7353e421551c6bd5963f436c38a (refs/tags/tag3)
       > C:\Program Files\Git\cmd\git.exe config core.sparsecheckout # timeout=120
       > C:\Program Files\Git\cmd\git.exe checkout -f e03409cea735e7353e421551c6bd5963f436c38a
      Commit message: "Removed env.GIT_COMMIT usage"
      [Pipeline] echo
      checkout scm returned SHA = 5e70b9e903582cd1055e60b819c6f2f09f01aee7
      [Pipeline] bat
      [test_scm_issue] Running batch script
      
      d:\jenkins\ws\test_scm_issue>git status 
      HEAD detached at e03409c
      nothing to commit, working tree clean
      

      Maybe it's related to JENKINS-45489?

        Attachments

          Issue Links

            Activity

            kakapo4 Mark Wright created issue -
            markewaite Mark Waite made changes -
            Field Original Value New Value
            Assignee Mark Waite [ markewaite ]
            kakapo4 Mark Wright made changes -
            Link This issue blocks JENKINS-45489 [ JENKINS-45489 ]
            kakapo4 Mark Wright made changes -
            Resolution Duplicate [ 3 ]
            Status Open [ 1 ] Resolved [ 5 ]
            markewaite Mark Waite made changes -
            Status Resolved [ 5 ] Closed [ 6 ]
            markewaite Mark Waite made changes -
            Released As git plugin 4.7.0 released 17 Mar 2021

              People

              Assignee:
              Unassigned Unassigned
              Reporter:
              kakapo4 Mark Wright
              Votes:
              0 Vote for this issue
              Watchers:
              2 Start watching this issue

                Dates

                Created:
                Updated:
                Resolved: