Skip to content
Snippets Groups Projects
Commit ca39bb1f authored by felmer's avatar felmer
Browse files

LMS-1610 fix bug

SVN: 17876
parent 971458ce
No related branches found
No related tags found
No related merge requests found
...@@ -19,7 +19,7 @@ OPENBIS_SERVER=$WORK/openBIS-server ...@@ -19,7 +19,7 @@ OPENBIS_SERVER=$WORK/openBIS-server
CI_HOST=cisd-vesuvio.ethz.ch CI_HOST=cisd-vesuvio.ethz.ch
SSH_CRUISE_CONTROL_NAME=ci@$CI_HOST SSH_CRUISE_CONTROL_NAME=ci@$CI_HOST
HUDSON_ARTIFACTS=$HOME/hudson/jobs HUDSON_ARTIFACTS=hudson/jobs
CI_HOST_IP=`host $CI_HOST|grep address|awk '{print $4}'` CI_HOST_IP=`host $CI_HOST|grep address|awk '{print $4}'`
MY_HOST=`hostname` MY_HOST=`hostname`
MY_HOST_IP=`host $MY_HOST|grep address|awk '{print $4}'` MY_HOST_IP=`host $MY_HOST|grep address|awk '{print $4}'`
...@@ -325,12 +325,12 @@ function fetch_latest_artifacts_from_cruise_control { ...@@ -325,12 +325,12 @@ function fetch_latest_artifacts_from_cruise_control {
local dest_dir=$2 local dest_dir=$2
local last_build="$HUDSON_ARTIFACTS/$proj_name/lastSuccessful/archive/_main/targets/dist" local last_build="$HUDSON_ARTIFACTS/$proj_name/lastSuccessful/archive/_main/targets/dist"
local list_cmd="ls -1 $last_build | sort | tail -1"
if [ $MY_HOST_IP == $CI_HOST_IP ]; then if [ $MY_HOST_IP == $CI_HOST_IP ]; then
local last=`eval $list_cmd` local last=`ls -1 $HOME/$last_build | sort | tail -1`
echo "Fetching artifacts for $proj_name: $last" echo "Fetching artifacts for $proj_name: $last"
cp $last_build/*.zip $dest_dir cp $last_build/*.zip $dest_dir
else else
local list_cmd="ls -1 $last_build | sort | tail -1"
local last=`echo $list_cmd | ssh $SSH_CRUISE_CONTROL_NAME -T` local last=`echo $list_cmd | ssh $SSH_CRUISE_CONTROL_NAME -T`
echo "Fetching artifacts for $proj_name: $last" echo "Fetching artifacts for $proj_name: $last"
scp $SSH_CRUISE_CONTROL_NAME:$last_build/*.zip $dest_dir scp $SSH_CRUISE_CONTROL_NAME:$last_build/*.zip $dest_dir
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment