commit 33ec6fc3fdab1f4589ddf7f1523562ead399944c
author Ruslan Gustomiasov <rgustomiasov@mirantis.com> Fri Aug 09 08:15:34 2019 +0000
committer Gerrit Code Review <mail@domain.com> Fri Aug 09 08:15:34 2019 +0000
tree f6dbb31b36129a02165c7d7916651c4345712bec
parent 7f68afa42b70a18188b81bd2adfd3d2eda62cb32
parent 000d364412447be8357a3c2ef38475b1f246a42f

Merge "Fully rewrite existing change and do not amend"

src/com/mirantis/mk/ReleaseWorkflow.groovy

diff --git a/src/com/mirantis/mk/ReleaseWorkflow.groovy b/src/com/mirantis/mk/ReleaseWorkflow.groovy
index 7fbf065..fd39ea9 100644
--- a/src/com/mirantis/mk/ReleaseWorkflow.groovy
+++ b/src/com/mirantis/mk/ReleaseWorkflow.groovy
@@ -132,8 +132,6 @@
             changeNum = jsonChange['number']
             ChangeId = 'Change-Id: '
             ChangeId += jsonChange['id']
-            //get existent change from gerrit
-            gerrit.getGerritChangeByNum(gitCredentialsId, venvDir, repoDir, gitRemote, changeNum)
         } else {
             ChangeId = ''
             git.createGitBranch(repoDir, crTopic)
@@ -146,11 +144,7 @@
                |${ChangeId}
             """.stripMargin()
         //commit change
-        if (gerritChange) {
-            git.commitGitChanges(repoDir, commitMessage, changeAuthorEmail, changeAuthorName, false, true)
-        } else {
-            git.commitGitChanges(repoDir, commitMessage, changeAuthorEmail, changeAuthorName, false)
-        }
+        git.commitGitChanges(repoDir, commitMessage, changeAuthorEmail, changeAuthorName, false)
         //post change
         gerrit.postGerritReview(gitCredentialsId, venvDir, repoDir, changeAuthorName, changeAuthorEmail, gitRemote, crTopic, metadataGerritBranch)
     }