diff options
| author | Dmitry Baryshkov <dmitry.baryshkov@linaro.org> | 2021-12-21 15:16:36 +0300 |
|---|---|---|
| committer | Nicolas Dechesne <nicolas.dechesne@linaro.org> | 2022-01-13 17:14:04 +0000 |
| commit | ad5f3196fe4e22d22f06a00e15b354aabdbcee90 (patch) | |
| tree | e0f2710cc119c7cfd5094999bdfc6f8e28789884 | |
| parent | 5a9e03c642e60285a5192fca1432fa3648fb3f28 (diff) | |
lt-qcom-linux-automerge: support specifying -t to ci-merge
Allow tracking head of the baseline, not only a branch
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Change-Id: Ic41bddb96c768c0ff42c587c374f5578f89a9f6d
| -rwxr-xr-x | lt-qcom-linux-automerge/builders.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lt-qcom-linux-automerge/builders.sh b/lt-qcom-linux-automerge/builders.sh index c343c14f12..00e007e653 100755 --- a/lt-qcom-linux-automerge/builders.sh +++ b/lt-qcom-linux-automerge/builders.sh @@ -103,7 +103,7 @@ AUTOMERGE_CONFIG=$(sed '/^#/d;/^$/d' ${CONFIG_PATH} | sed ':a;N;$!ba;s/\n/\\n\\\ # * TODO: Add support in ci-merge to create a log (instead of use tee) set +e set -o pipefail -ci-merge -l ${INTEGRATION_REPO_PATH} -r ${INTEGRATION_REPO_URL} -i ${INTEGRATION_BRANCH} -c ${RERERE_REPO_URL} | tee automerge.log +ci-merge -l ${INTEGRATION_REPO_PATH} -r ${INTEGRATION_REPO_URL} -i ${INTEGRATION_BRANCH} -c ${RERERE_REPO_URL} -t ${AUTOMERGE_TRACK:-tag} | tee automerge.log AUTOMERGE_EXIT_CODE=$? set +o pipefail AUTOMERGE_BRANCH_FAILED=$(grep 'Merge failed' automerge.log | sed ':a;N;$!ba;s/\n/\\n\\\n/g') |