diff options
| author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2016-07-15 13:46:23 +0100 |
|---|---|---|
| committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2016-08-05 12:20:00 +0000 |
| commit | 708ca7d6a2ab8e4b0d612254b49e8f3e4d5afa97 (patch) | |
| tree | 13b19793abfea786e6a9e7f2dfcfef84c5abe738 /MakeRelease.job | |
| parent | b0b2f1559db314c828a2645689c34dce78003a75 (diff) | |
Cleanup usage of "fileserver" and "ref" options in scripts
Remove --fileserver from jenkins.sh, but keep it in MakeRelease.job,
since the latter is using fileserver as logserver.
Also fix path to reference snapshots.
Change-Id: Idbb77318810e5f9c0597a6182e2bc84d036e9400
Diffstat (limited to 'MakeRelease.job')
| -rwxr-xr-x | MakeRelease.job | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/MakeRelease.job b/MakeRelease.job index 21bbfd65..948f2aa2 100755 --- a/MakeRelease.job +++ b/MakeRelease.job @@ -7,7 +7,6 @@ usage() { echo " --workspace - Specify an alternate workspace" echo " --target XXX - Specify the target triplet to build" echo " --date XXX - Specify a date, which becomes part of the release name" - echo " --ref XXX - Specify a Git reference directory" echo " --toolchainconfig XXX - [Optional] Explicitly define which toolchain" echo " to build, e.g., 'default', 'gcc5', 'gcc6'. " echo " If not specified, 'default' is the default" @@ -33,20 +32,18 @@ else export CONFIG_SHELL="/bin/bash" fi target="" -ref="snapshots-ref" fileserver="148.251.136.42" extra= toolchain_config="" user_workspace="${WORKSPACE:-/home/${USER:-buildslave}/workspace}" logfile=${user_workspace}/MakeRelease-${BUILD_NUMBER}.log -OPTS="`getopt -o r:t:f:d:w:m:l:g:u:h -l target:,ref:,date:,fileserver:,workspace:,toolchainconfig:,manifest:,glibc:,gcc:,binutils:,help`" +OPTS="`getopt -o t:f:d:w:m:l:g:u:h -l target:,date:,fileserver:,workspace:,toolchainconfig:,manifest:,glibc:,gcc:,binutils:,help`" while test $# -gt 0; do case $1 in -w|--workspace) user_workspace=$2 ;; -t|--target) target=$2 ;; -d|--date) date=$2 ;; - -r|--ref) ref=$2 ;; --toolchainconfig) toolchain_config=$2 ;; -f|--fileserver) fileserver=$2 ;; -m|--manifest) manifest_src=$2 ;; @@ -103,7 +100,7 @@ cd ${user_workspace}/_build if ! test -e host.conf; then $CONFIG_SHELL ${abe_dir}/configure --with-local-snapshots=${user_snapshots} \ - --with-git-reference-dir=${shared}/snapshots --with-fileserver=${fileserver} --with-remote-snapshots=${ref} + --with-git-reference-dir=/home/tcwg-buildslave/snapshots-ref fi if test x"${date}" != x; then |