X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=utils%2Fpush-test-logs.sh;h=ed6825be2fd715ea5c1a9bb5a343b1f9993e2f70;hb=01fe2364f175bc0904003e281df66cdaaedea869;hp=87cee78bfdba05c3895d9be975ec9ca910c9fa87;hpb=6a082c66d6f14ba8801e0a02fe5bd193c2a32f68;p=releng.git diff --git a/utils/push-test-logs.sh b/utils/push-test-logs.sh index 87cee78bf..ed6825be2 100644 --- a/utils/push-test-logs.sh +++ b/utils/push-test-logs.sh @@ -15,7 +15,7 @@ export PATH=$PATH:/usr/local/bin/ git_sha1="$(git rev-parse HEAD)" res_build_date=${1:-$(date -u +"%Y-%m-%d_%H-%M-%S")} project=$PROJECT -branch=${GIT_BRANCH##*/} +branch=${BRANCH##*/} testbed=$NODE_NAME dir_result="${HOME}/opnfv/$project/results/${branch}" # src: https://wiki.opnfv.org/display/INF/Hardware+Infrastructure @@ -23,10 +23,13 @@ dir_result="${HOME}/opnfv/$project/results/${branch}" node_list=(\ 'lf-pod1' 'lf-pod2' 'intel-pod2' 'intel-pod3' \ 'intel-pod5' 'intel-pod6' 'intel-pod7' 'intel-pod8' \ -'ericsson-pod2' 'ericsson-pod3' 'ericsson-pod4' \ -'ericsson-virtual2' 'ericsson-virtual3' 'ericsson-virtual4' 'ericsson-virtual5' \ +'ericsson-pod1' 'ericsson-pod2' \ +'ericsson-virtual1' 'ericsson-virtual2' 'ericsson-virtual3' \ +'ericsson-virtual4' 'ericsson-virtual5' \ 'arm-pod1' 'arm-pod3' \ -'huawei-pod1' 'huawei-pod2' 'huawei-virtual1' 'huawei-virtual2' 'huawei-virtual3' 'huawei-virtual4') +'huawei-pod1' 'huawei-pod2' 'huawei-pod3' 'huawei-pod4' 'huawei-pod5' \ +'huawei-pod6' 'huawei-pod7' \ +'huawei-virtual1' 'huawei-virtual2' 'huawei-virtual3' 'huawei-virtual4') if [[ ! " ${node_list[@]} " =~ " ${testbed} " ]]; then @@ -53,7 +56,7 @@ if [ -d "$dir_result" ]; then else gsutil ls gs://artifacts.opnfv.org/"$project"/ &>/dev/null if [ $? != 0 ]; then - echo "Not possible to push results to artifact: gsutil not installed."; + echo "Not possible to push results to artifact: some error happened when using gsutil"; else echo "Uploading logs to artifact $project_artifact" gsutil -m cp -r "$dir_result"/* gs://artifacts.opnfv.org/"$project_artifact"/ >/dev/null 2>&1