From 6b6b27536feb15e544b18467c95431ca771e9f32 Mon Sep 17 00:00:00 2001
From: Dmitry Burmistrov <dburmistrov@mirantis.com>
Date: Mon, 19 Sep 2016 13:33:43 +0300
Subject: [PATCH] Do not override GERRIT_CHANGE_STATUS

   Use GERRIT_CHANGE_STATUS provided by zuul instead of getting from
   gerrit

Change-Id: Ice1f423b0b9ff7c1eb5dfe6868048e935ea14bc4
Closes-Bug: #1623562
---
 perestroika/build-functions.sh | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/perestroika/build-functions.sh b/perestroika/build-functions.sh
index 643d5da..2a1e02a 100644
--- a/perestroika/build-functions.sh
+++ b/perestroika/build-functions.sh
@@ -57,13 +57,16 @@ set_default_params () {
   [ -z "$PROJECT_VERSION" ] && error "Project version is not defined! Exiting!"
   [ "$IS_HOTFIX" == "true" -a "$IS_UPDATES" == "false" ] && error "ERROR: Hotfix update before release"
   if [ -n "$GERRIT_PROJECT" ]; then
-    GERRIT_CHANGE_STATUS="NEW"
-    if [ -n "$GERRIT_REFSPEC" ]; then
-      request_is_merged $GERRIT_REFSPEC && GERRIT_CHANGE_STATUS="MERGED"
-    else
-      # Support ref-updated gerrit event
-      GERRIT_CHANGE_STATUS="REF_UPDATED"
-      GERRIT_BRANCH=$GERRIT_REFNAME
+    if [ -z "$GERRIT_CHANGE_STATUS" ] ; then
+        # Detect change status
+        GERRIT_CHANGE_STATUS="NEW"
+        if [ -n "$GERRIT_REFSPEC" ]; then
+          request_is_merged $GERRIT_REFSPEC && GERRIT_CHANGE_STATUS="MERGED"
+        else
+          # Support ref-updated gerrit event
+          GERRIT_CHANGE_STATUS="REF_UPDATED"
+          GERRIT_BRANCH=$GERRIT_REFNAME
+        fi
     fi
     if [ -n "$GERRIT_CHANGE_COMMIT_MESSAGE" ] ; then
         local GERRIT_MEGGASE="`echo $GERRIT_CHANGE_COMMIT_MESSAGE | base64 -d || :`"