summaryrefslogtreecommitdiff
path: root/MakeRelease.job
diff options
context:
space:
mode:
authorMaxim Kuvyrkov <maxim.kuvyrkov@linaro.org>2016-12-14 12:34:12 +0000
committerMaxim Kuvyrkov <maxim.kuvyrkov@linaro.org>2016-12-14 12:34:12 +0000
commit79095ee7cba38beac64a1dcfa67a8ff1b7313e23 (patch)
tree23da1b4fdb20f00916ae72afc91137f5ddb1ab4b /MakeRelease.job
parent625e4c0332c1a4ab2da35d5a296564b00f2909c8 (diff)
parent5b759a81f8cc68c470c50080172bb6d23d92d405 (diff)
Update scripts from ABE. Merge remote-tracking branch 'jenkins-sh/master'
Change-Id: I8e66a03e2533620a6d941d2af4715502f87ef6d4
Diffstat (limited to 'MakeRelease.job')
-rwxr-xr-xMakeRelease.job7
1 files changed, 4 insertions, 3 deletions
diff --git a/MakeRelease.job b/MakeRelease.job
index 2822a1df..6c48a514 100755
--- a/MakeRelease.job
+++ b/MakeRelease.job
@@ -69,7 +69,6 @@ fi
shared="/home/buildslave/workspace/shared/"
user_snapshots="${user_workspace}/snapshots"
-logfile=${user_workspace}/MakeRelease-${BUILD_NUMBER}.log
if test -e ${user_workspace}; then
cat << EOF > ${user_workspace}/BUILD-INFO.txt
@@ -133,6 +132,7 @@ glibc=${glibc_src:+glibc=${glibc_src}}
binutils=${binutils_src:+binutils=${binutils_src}}
gcc=${gcc_src:+gcc=${gcc_src}}
srcs="${gcc} ${binutils} ${glibc} ${manifest}"
+logfile=${user_workspace}/MakeRelease-${BUILD_NUMBER}-${arch}.log
# Build a binary release tarball
# Remove logfile if present (for some unknown reason)
@@ -193,8 +193,9 @@ series_date=${series_date%-linux}
series_date=${series_date%-win32}
# Fileserver location of binary tarballs and build logfiles
-binaries="/work/space/binaries/${gcc_release}-${series_date}/${target}"
-logs="/work/space/logs/${gcc_release}-${series_date}/${target}"
+buildid=`printf '%04d' ${BUILD_NUMBER}`
+binaries="/work/space/binaries/${gcc_release}-${series_date}-${buildid}/${target}"
+logs="/work/space/logs/${gcc_release}-${series_date}-${buildid}/${target}"
# Copy the build log to the fileserver
if test -e ${logfile}; then