jenkins_verify: improve cherry pick - step 13 [1/1]
PD#SWPL-67525
Problem:
improve cherry pick - step 13
Solution:
improve cherry pick - step 13
Verify:
ad401_a113l
Signed-off-by: Kelvin Zhang <kelvin.zhang@amlogic.com>
Change-Id: Iefeb7caeb0da5a1a37e73bd54237cf48e5020bf6
diff --git a/cherry_pick.sh b/cherry_pick.sh
index 6ae598e..f9e528b 100755
--- a/cherry_pick.sh
+++ b/cherry_pick.sh
@@ -36,12 +36,12 @@
[ -z "$GERRIT_CHANGE_NUMBER" -o -z "$GERRIT_PROJECT" -o -z "$GERRIT_REFSPEC" ] && [ -z "$MANUAL_GERRIT_CHANGE_NUMBER" ] && return
if [ -n "$GERRIT_CHANGE_NUMBER" ] && [ -n "$GERRIT_PROJECT" ] && [ -n "$GERRIT_REFSPEC" ]; then
- echo -e "\n======== Auto-applying Gerrit change $GERRIT_CHANGE_NUMBER on Project $GERRIT_PROJECT ========"
+ echo -e "======== Auto-applying Gerrit change $GERRIT_CHANGE_NUMBER on Project $GERRIT_PROJECT ========"
elif [ -n "$MANUAL_GERRIT_CHANGE_NUMBER" ]; then
ssh -p $GERRIT_PORT $GERRIT_SERVER gerrit query --format=JSON --current-patch-set status:open change:$MANUAL_GERRIT_CHANGE_NUMBER > $GERRIT_QUERY_RESULT
GERRIT_PROJECT=$(jq -r '.project // empty' $GERRIT_QUERY_RESULT)
GERRIT_REFSPEC=$(jq -r '.currentPatchSet.ref // empty' $GERRIT_QUERY_RESULT)
- echo -e "\n======== Manually applying Gerrit change $MANUAL_GERRIT_CHANGE_NUMBER on Project $GERRIT_PROJECT ========"
+ echo -e "======== Manually applying Gerrit change $MANUAL_GERRIT_CHANGE_NUMBER on Project $GERRIT_PROJECT ========"
fi
keyline=`grep "name=\"$GERRIT_PROJECT\"" $CURRENT_MANIFEST`
@@ -59,7 +59,7 @@
GERRIT_PROJECTS=$(jq -r '.project // empty' $GERRIT_QUERY_RESULT)
GERRIT_REFSPECS=$(jq -r '.currentPatchSet.ref // empty' $GERRIT_QUERY_RESULT)
- echo -e "\n======== Manually applying Gerrit changes ========"
+ echo -e "======== Manually applying Gerrit changes ========"
i=1
for GERRIT_PROJECT in $GERRIT_PROJECTS; do