diff options
| author | Aníbal Limón <anibal.limon@linaro.org> | 2018-04-23 11:47:13 -0500 |
|---|---|---|
| committer | Anibal Limon <anibal.limon@linaro.org> | 2018-04-23 16:51:03 +0000 |
| commit | 61c73c7cdd681e6f39982a2ab49b6f9c993a3bf7 (patch) | |
| tree | d24f13be92cabc64bd937e29ad2f4f253ef0ed12 | |
| parent | ef1fbaf0119266cfbaa4123dfa6dca685d55d64c (diff) | |
lt-qcom-linux-automerge: Fix multiline variables in envinject
Jenkins expects to have newline '\n' encoded as '\\' into the file
that will be loaded by envinject plugin.
See checkWithNewlineInValues in:
https://github.com/jenkinsci/envinject-plugin/blob/master/src/test/java/org/jenkinsci/plugins/envinject/sevice/PropertiesLoaderTest.java#L126
Change-Id: I7adccdd400fbcd2ef563c7b94465303e9de245c2
Signed-off-by: Aníbal Limón <anibal.limon@linaro.org>
| -rwxr-xr-x | lt-qcom-linux-automerge/builders.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lt-qcom-linux-automerge/builders.sh b/lt-qcom-linux-automerge/builders.sh index f9724315b1..11b8c2cd62 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=$(awk '{ print $0 " \\" }' ${CONFIG_PATH} | sed 's/.$//') +AUTOMERGE_CONFIG=$(sed ':a;N;$!ba;s/\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} | tee automerge.log AUTOMERGE_EXIT_CODE=$? -AUTOMERGE_BRANCH_FAILED=$(grep 'Merge failed' automerge.log | awk '{ print $0 " \\" }' | sed 's/.$//') +AUTOMERGE_BRANCH_FAILED=$(grep 'Merge failed' automerge.log | sed ':a;N;$!ba;s/\n/\\\\/g') set -e popd |