diff options
| author | Aníbal Limón <anibal.limon@linaro.org> | 2018-04-20 15:10:03 -0500 |
|---|---|---|
| committer | Anibal Limon <anibal.limon@linaro.org> | 2018-04-20 20:20:46 +0000 |
| commit | dc0dff077825b33a288bdbe17b1b203ad19e3887 (patch) | |
| tree | bf0b3d64a6861428bb5cd9bbd08a4e4e695e0f7b /lt-qcom-linux-automerge | |
| parent | 703a8d536339a030e2df20c394e2734ec0e10d22 (diff) | |
lt-qcom-linux-automerge/builders.sh: Fixes in automerge result variables
* Add \ at EOL to fix multi-line cut when display in email
* Removes cat to display variables in console not needed because of set -x
* Get rid of "" characters
Change-Id: Ic823fa3fc48f294db5e4fa1d9fb8b6a3aee487ae
Signed-off-by: Aníbal Limón <anibal.limon@linaro.org>
Diffstat (limited to 'lt-qcom-linux-automerge')
| -rwxr-xr-x | lt-qcom-linux-automerge/builders.sh | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/lt-qcom-linux-automerge/builders.sh b/lt-qcom-linux-automerge/builders.sh index 1b4f8e6f01..f9724315b1 100755 --- a/lt-qcom-linux-automerge/builders.sh +++ b/lt-qcom-linux-automerge/builders.sh @@ -91,18 +91,17 @@ EOF export CONFIG_PATH=${AUTOMERGE_PATH}/automerge-ci.conf fi -AUTOMERGE_CONFIG=$(cat ${CONFIG_PATH}) +AUTOMERGE_CONFIG=$(awk '{ print $0 " \\" }' ${CONFIG_PATH} | sed 's/.$//') # * Disable exit when fail to collect build logs set +e yes | ci-merge -l ${INTEGRATION_REPO_PATH} -r ${INTEGRATION_REPO_URL} -i ${INTEGRATION_BRANCH} | tee automerge.log AUTOMERGE_EXIT_CODE=$? -AUTOMERGE_BRANCH_FAILED=$(grep "Merge failed," automerge.log) +AUTOMERGE_BRANCH_FAILED=$(grep 'Merge failed' automerge.log | awk '{ print $0 " \\" }' | sed 's/.$//') set -e popd -echo "AUTOMERGE_CONFIG=\"${AUTOMERGE_CONFIG}\"" > automerge_result_variables -echo "AUTOMERGE_BRANCH_FAILED=\"${AUTOMERGE_BRANCH_FAILED}\"" >> automerge_result_variables +echo "AUTOMERGE_CONFIG=${AUTOMERGE_CONFIG}" > automerge_result_variables +echo "AUTOMERGE_BRANCH_FAILED=${AUTOMERGE_BRANCH_FAILED}" >> automerge_result_variables echo "AUTOMERGE_EXIT_CODE=${AUTOMERGE_EXIT_CODE}" >> automerge_result_variables -echo "INTEGRATION_REPO_PATH=\"${INTEGRATION_REPO_PATH}\"" >> automerge_result_variables -cat automerge_result_variables +echo "INTEGRATION_REPO_PATH=${INTEGRATION_REPO_PATH}" >> automerge_result_variables |