commit a2edfb24d762bc228ebe7c4dfcc5518eb42b0d59
author Roman Vyalov <rvyalov@mirantis.com> Mon May 07 11:18:49 2018 +0000
committer Gerrit Code Review <gerrit2@1f6678a0cecc> Mon May 07 11:18:49 2018 +0000
tree 534581bf46f3a9098a43d3344c0e378d62deedec
parent 65098acd458d1e1a62295e3feb2a260e27fd89bf
parent bb61e81f9e8a69655914cad7e7b57039ef561455

Merge "Enforce logrotate state"

src/com/mirantis/mk/Debian.groovy

diff --git a/src/com/mirantis/mk/Debian.groovy b/src/com/mirantis/mk/Debian.groovy
index 7b778e8..94b0598 100644
--- a/src/com/mirantis/mk/Debian.groovy
+++ b/src/com/mirantis/mk/Debian.groovy
@@ -155,7 +155,15 @@
                 else
                     NEW_VERSION=\$VERSION+\$TIMESTAMP.`git rev-parse --short HEAD`$revisionPostfix
                 fi &&
-                sudo -H -E -u jenkins gbp dch --auto --multimaint-merge --ignore-branch --new-version=\$NEW_VERSION --distribution `lsb_release -c -s` --force-distribution &&
+                sudo -H -E -u jenkins gbp dch \
+                    --auto \
+                    --git-author \
+                    --id-length=7 \
+                    --git-log='--reverse' \
+                    --ignore-branch \
+                    --new-version=\$NEW_VERSION \
+                    --distribution `lsb_release -c -s` \
+                    --force-distribution &&
                 sudo -H -E -u jenkins git add -u debian/changelog &&
                 sudo -H -E -u jenkins git commit -m "New snapshot version \$NEW_VERSION"
             ) &&