diff options
| author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2018-07-02 05:48:29 +0000 |
|---|---|---|
| committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2018-07-02 05:48:29 +0000 |
| commit | 29569f5abbb436ebbc81614bda0b3c23fce38690 (patch) | |
| tree | dcf92da8cde07949efecbafacc6b0439ff4dc5ef /MakeRelease.job | |
| parent | 23025ea4eefc5c078adfd243a72dbe8df3b5d674 (diff) | |
MakeRelease.job: Add --artifacts_top option
... and make --fileserver parameter optional. This allows copying of
binaries and logs to a local directory without uploading to a remote
server. The intention is to then upload artifacts to snapshots.l.o
under components/toolchain/dev-builds/ .
Change-Id: Ifa315533c7cb1925343dd8dbd3fce1188ace6fe1
Diffstat (limited to 'MakeRelease.job')
| -rwxr-xr-x | MakeRelease.job | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/MakeRelease.job b/MakeRelease.job index cf3634c1..abef1aa2 100755 --- a/MakeRelease.job +++ b/MakeRelease.job @@ -59,8 +59,9 @@ binutils_src= glibc_src= manifest_src= toolchain_config= +artifacts_top="releases" -OPTS="`getopt -o h -l target:,release_name:,fileserver:,workspace:,toolchainconfig:,manifest:,glibc:,gcc:,binutils:,help,abedir:,binariesdir:,logsdir:,canadian,buildnumber:`" +OPTS="`getopt -o h -l target:,release_name:,fileserver:,workspace:,toolchainconfig:,manifest:,glibc:,gcc:,binutils:,help,abedir:,binariesdir:,logsdir:,canadian,buildnumber:,artifacts_top:`" while test $# -gt 0; do case $1 in --abedir) abe_dir=$2 ; shift ;; @@ -77,6 +78,7 @@ while test $# -gt 0; do --logsdir) logsdir=$2 ; shift ;; --canadian) canadian=true ;; --buildnumber) buildnumber=$2 ; shift ;; + --artifacts_top) artifacts_top=$2; shift ;; -h|--help) usage 0 ;; --) break ;; *) usage ;; @@ -90,8 +92,9 @@ if test x"${abe_dir}" = x; then fi if test x"${fileserver}" = x; then - echo "Error: --fileserver missing" - usage + rsh="sh -c" +else + rsh="ssh $fileserver" fi if test x"${target}" != x"native" -a x"${target}" != x; then @@ -224,8 +227,8 @@ series_date=${series_date%-win32} # Fileserver location of binary tarballs and build logfiles buildid=`printf '%04d' ${buildnumber}` -binaries="releases/binaries/${gcc_release}-${series_date}-${buildid}/${target}" -logs="releases/logs/${gcc_release}-${series_date}-${buildid}/${target}" +binaries="$artifacts_top/binaries/${gcc_release}-${series_date}-${buildid}/${target}" +logs="$artifacts_top/logs/${gcc_release}-${series_date}-${buildid}/${target}" if [ "x${binariesdir}" != "x" -a \ "x${binariesdir}" != "x${binaries}" ]; then @@ -247,9 +250,9 @@ fi if test -e ${logfile}; then echo "Compressing log file..." xz ${logfile} - ssh ${fileserver} "if test ! -d ${logs}; then mkdir -p ${logs}; fi" - echo "Copying compressed log file ${logfile}.xz to ${fileserver}:${logs}..." - rsync -a ${logfile}.xz ${fileserver}:${logs}/ + $rsh "if test ! -d ${logs}; then mkdir -p ${logs}; fi" + echo "Copying compressed log file ${logfile}.xz to ${fileserver:+$fileserver:}${logs}..." + rsync -a ${logfile}.xz ${fileserver:+$fileserver:}${logs}/ fi # force a failure if abe has build problems. @@ -257,16 +260,16 @@ if test ${abe_ret} -ne 0; then exit 1 fi -# Copy the binary test results to the fileserver -ssh ${fileserver} "if test ! -d ${binaries}; then mkdir -p ${binaries}; fi" +# Copy the binaries to the fileserver +$rsh "if test ! -d ${binaries}; then mkdir -p ${binaries}; fi" # There could be a linux and/or a win32 manifest. for manifest in "${manifests[@]}" do - rsync -a ${manifest} ${fileserver}:${binaries}/ + rsync -a ${manifest} ${fileserver:+$fileserver:}${binaries}/ done -rsync -a "${tarballs[@]}" ${fileserver}:${binaries}/ +rsync -a "${tarballs[@]}" ${fileserver:+$fileserver:}${binaries}/ echo "Starting manifest validation." git clone --depth 1 git://git.linaro.org/toolchain/abe-tests.git |