X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=utils%2Fpush-test-logs.sh;h=265ca6120aa132eb675d96e8f976cad8f14e8af1;hb=0f54f23e804ec095b5ff84c3a6086c0855ed28c5;hp=972853b7852eeefb699581dce3f27a44ff9a4eb8;hpb=da3bc3668fa4cef4e5f616caf3f35e73df35e3bf;p=releng.git diff --git a/utils/push-test-logs.sh b/utils/push-test-logs.sh index 972853b78..265ca6120 100644 --- a/utils/push-test-logs.sh +++ b/utils/push-test-logs.sh @@ -17,11 +17,20 @@ res_build_date=${1:-$(date -u +"%Y-%m-%d_%H-%M-%S")} project=$PROJECT branch=${GIT_BRANCH##*/} testbed=$NODE_NAME -dir_result="${HOME}/opnfv/$project/results/$branch" +dir_result="${HOME}/opnfv/$project/results/${branch}" +# src: https://wiki.opnfv.org/display/INF/Hardware+Infrastructure +# + intel-pod3 (vsperf) node_list=(\ -'opnfv-jump-1' 'opnfv-jump-2' 'ericsson-pod1' 'ericsson-pod2' \ -'intelpod2-jumphost' 'intel-pod3' 'intel-pod5' 'intel-pod6' \ -'intel-pod8' 'huawei-us-deploy-bare-1' 'orange-fr-pod2') +'lf-pod1' 'lf-pod2' 'intel-pod2' 'intel-pod3' \ +'intel-pod5' 'intel-pod6' 'intel-pod7' 'intel-pod8' \ +'ericsson-pod1' 'ericsson-pod2' \ +'ericsson-virtual1' 'ericsson-virtual2' 'ericsson-virtual3' \ +'ericsson-virtual4' 'ericsson-virtual5' \ +'arm-pod1' 'arm-pod3' \ +'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 echo "This is not a CI POD. Aborting pushing the logs to artifacts." @@ -47,10 +56,16 @@ 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 "copy result files to artifact $project_artifact" - gsutil -m cp -r "$dir_result" gs://artifacts.opnfv.org/"$project_artifact"/ + echo "Uploading logs to artifact $project_artifact" + gsutil -m cp -r "$dir_result"/* gs://artifacts.opnfv.org/"$project_artifact"/ >/dev/null 2>&1 + echo "Logs can be found in http://artifacts.opnfv.org/logs_${project}_${testbed}.html" + cd $dir_result + files=($(find . -name \* -print|sed 's/^\.//'|sed '/^\s*$/d')) + for f in ${files[@]}; do + echo "http://artifacts.opnfv.org/${project_artifact}${f}" + done fi fi else