diff options
| author | Aníbal Limón <anibal.limon@linaro.org> | 2018-04-23 09:45:55 -0500 |
|---|---|---|
| committer | Aníbal Limón <anibal.limon@linaro.org> | 2018-04-23 09:47:20 -0500 |
| commit | 5c2907fc97a1f9735f44fb0f371ad2ccf212cc15 (patch) | |
| tree | 229f7b575639b5e768235f8c6c14c5aeb75a21e8 | |
| parent | c13d6a802afed338fdf57a280257635dae685f7d (diff) | |
lt-qcom-linux-automerge: Exit if any branch fail to merge
Before try build the kernel check if Automerge repo/branch merge
fail and mark the whole build as a failure.
Change-Id: I16e4bd76502a385f8edfd11b1e9401897f014e2e
Signed-off-by: Aníbal Limón <anibal.limon@linaro.org>
| -rwxr-xr-x | lt-qcom-linux-automerge/builders-kernel.sh | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lt-qcom-linux-automerge/builders-kernel.sh b/lt-qcom-linux-automerge/builders-kernel.sh index 0c5306c966..3b280794d2 100755 --- a/lt-qcom-linux-automerge/builders-kernel.sh +++ b/lt-qcom-linux-automerge/builders-kernel.sh @@ -27,9 +27,16 @@ function build_integration_kernel() } if [ ${AUTOMERGE_EXIT_CODE} -ne 0 ]; then + echo "ERROR: Automerge failed, returned ${AUTOMERGE_EXIT_CODE}" exit ${AUTOMERGE_EXIT_CODE} fi +if [ ! -z ${AUTOMERGE_BRANCH_FAILED} ]; then + echo "ERROR: Automerge failed," + echo "${AUTOMERGE_BRANCH_FAILED}" + exit 1 +fi + cd ${INTEGRATION_REPO_PATH} build_integration_kernel "arm" "multi_v7_defconfig" build_integration_kernel "arm64" "defconfig" |