summaryrefslogtreecommitdiff
path: root/jenkins.sh
diff options
context:
space:
mode:
authorBernard Ogden <bernie.ogden@linaro.org>2015-12-08 09:52:27 +0000
committerBernard Ogden <bernie.ogden@linaro.org>2015-12-08 13:35:22 +0000
commitf997fe187594c285a5966b54239df0aaa9ff3a46 (patch)
tree1a3230f57c003872f73bb1dea40570fe4945240e /jenkins.sh
parent4a96a2b009b5af2079331f8d2eea2d1d8e98aea9 (diff)
Unambiguous manifest location
If building with such options as tarbin, we get a duplicate manifest inside destdir. Look for the manifest inside build, excluding destdir. There should always be exactly one such manifest. Symptom of multiple manifests is jenkins.sh exiting with error due to: + jenkins.sh: 405: test 'x/<some_path>/foo@bar-<date>-manifest.txt /<some other path>/foo@bar-<date>-manifest.txt' '!=' x + jenkins.sh: 406: echo node=tcwg_x86_64_ex40build_07 ./jenkins.sh: line 406: ${manifest}: ambiguous redirect Change-Id: Id3db8c084622efb0f09504eec51a7b4d1594272a
Diffstat (limited to 'jenkins.sh')
-rwxr-xr-xjenkins.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/jenkins.sh b/jenkins.sh
index 80b853f0..63db8a2b 100755
--- a/jenkins.sh
+++ b/jenkins.sh
@@ -401,7 +401,7 @@ fi
echo "Build by ${requestor} on ${NODE_NAME} for branch ${branch}"
-manifest="`find ${user_workspace} -name \*manifest.txt`"
+manifest="`find ${user_workspace}/_build/builds/ -name destdir -prune -o -name \*manifest.txt -print`"
if test x"${manifest}" != x; then
echo "node=${node}" >> ${manifest}
echo "requestor=${requestor}" >> ${manifest}