diff options
| author | Aníbal Limón <anibal.limon@linaro.org> | 2018-05-18 09:52:39 -0500 |
|---|---|---|
| committer | Anibal Limon <anibal.limon@linaro.org> | 2018-05-18 14:53:35 +0000 |
| commit | 0f7ae7b896857aa4fc41e894089b452492e64eed (patch) | |
| tree | 63bffcc13ca63557633bad75efc9ef36fb569fb8 /lt-qcom-linux-automerge | |
| parent | e784c3676ad37c3fe6f1595d5e796fa650757218 (diff) | |
lt-qcom-linux-automerge: Fix multiline variables
Add \\n characters to ensure new line works.
Change-Id: Ib1cdca68839d59eb7da32778420071bbe2be2860
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 | 4 | ||||
| -rw-r--r-- | lt-qcom-linux-automerge/presend-script.groovy | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/lt-qcom-linux-automerge/builders.sh b/lt-qcom-linux-automerge/builders.sh index e4497c11..b615a299 100755 --- a/lt-qcom-linux-automerge/builders.sh +++ b/lt-qcom-linux-automerge/builders.sh @@ -91,13 +91,13 @@ EOF export CONFIG_PATH=${AUTOMERGE_PATH}/automerge-ci.conf fi -AUTOMERGE_CONFIG=$(sed ':a;N;$!ba;s/\n/\\n/g' ${CONFIG_PATH}) +AUTOMERGE_CONFIG=$(sed ':a;N;$!ba;s/\n/\\\n\/g' ${CONFIG_PATH}) # * Disable exit when fail to collect build logs set +e yes | ci-merge -l ${INTEGRATION_REPO_PATH} -r ${INTEGRATION_REPO_URL} -i ${INTEGRATION_BRANCH} -c ${RERERE_REPO_URL} | tee automerge.log AUTOMERGE_EXIT_CODE=$? -AUTOMERGE_BRANCH_FAILED=$(grep 'Merge failed' automerge.log | sed ':a;N;$!ba;s/\n/\\n/g') +AUTOMERGE_BRANCH_FAILED=$(grep 'Merge failed' automerge.log | sed ':a;N;$!ba;s/\n/\\\n/g') set -e popd diff --git a/lt-qcom-linux-automerge/presend-script.groovy b/lt-qcom-linux-automerge/presend-script.groovy index 0b9f2bd3..41b1cd02 100644 --- a/lt-qcom-linux-automerge/presend-script.groovy +++ b/lt-qcom-linux-automerge/presend-script.groovy @@ -1,5 +1,3 @@ automerge_config = sprintf(build.envVars["AUTOMERGE_CONFIG"]) automerge_branch_failed = sprintf(build.envVars["AUTOMERGE_BRANCH_FAILED"]) -msg.setContent(msg.getContent().replace("{{AUTOMERGE_CONFIG}}", automerge_config), 'text/plain') -msg.setContent(msg.getContent().replace("{{AUTOMERGE_BRANCH_FAILED}}", automerge_branch_failed), 'text/plain') |