commit 37b735d8763c3e4bd51f0f5c42af335b3a361c94
author vnaumov <vnaumov@mirantis.com> Mon Aug 27 16:55:07 2018 +0400
committer vnaumov <vnaumov@mirantis.com> Mon Aug 27 16:57:42 2018 +0400
tree 30628d0d769bf41ae3f7f125c89e33a92fd1debd
parent c0fe1442f8bd6f32329be37200f9b9c56a2ef3ed

Workaround for Jenkins issue

*steps to reproduce*:
it failed only when set
withMerge policy

``
try {
    stage(“Checkout”) {
       gerrit.gerritPatchsetCheckout([
           credentialsId: CREDENTIALS_ID,
           *withMerge: true*,
       ])
}``

proofs: https://ci.mcp.mirantis.net/view/MAP/job/map-build-component-image/5/console

root cause - incorrect case-resolving in git plugin
related issue: https://issues.jenkins-ci.org/browse/JENKINS-51638
p.s. workaround in comments

Change-Id: I9ffd85a61613eecaeb96fbacb1a28bb6a37cb60f

src/com/mirantis/mk/Gerrit.groovy

diff --git a/src/com/mirantis/mk/Gerrit.groovy b/src/com/mirantis/mk/Gerrit.groovy
index 99c91b7..d1c0a1c 100644
--- a/src/com/mirantis/mk/Gerrit.groovy
+++ b/src/com/mirantis/mk/Gerrit.groovy
@@ -76,7 +76,7 @@
 
         // if we need to "merge" code from patchset to GERRIT_BRANCH branch
         if (merge) {
-            scmExtensions.add([$class: 'PreBuildMerge', options: [fastForwardMode: 'FF', mergeRemote: 'gerrit', mergeStrategy: 'default', mergeTarget: gerritBranch]])
+            scmExtensions.add([$class: 'PreBuildMerge', options: [fastForwardMode: 'FF', mergeRemote: 'gerrit', mergeStrategy: 'DEFAULT', mergeTarget: gerritBranch]])
         }
         // we need wipe workspace before checkout
         if (wipe) {
@@ -246,4 +246,4 @@
     def missedParams = requiredParams - config.keySet()
     def badParams = config.subMap(requiredParams).findAll{it.value in [null, '']}.keySet()
     return badParams + missedParams
-}
\ No newline at end of file
+}