X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=utils%2Fpush-test-logs.sh;h=253cfa7b32de721950563a85bffca7c27bac8e0b;hb=ea41680215f382b1ad70e4dc564529d728665378;hp=f24d884f5300581aef1029d1dda4935aebf26914;hpb=ebeaa913386df4c9ebb0110ffdcd298540b1b4d5;p=releng.git diff --git a/utils/push-test-logs.sh b/utils/push-test-logs.sh index f24d884f5..253cfa7b3 100644 --- a/utils/push-test-logs.sh +++ b/utils/push-test-logs.sh @@ -15,17 +15,25 @@ 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 -# + intel-pod3 (vsperf) +# + intel-pod12 (vsperf) node_list=(\ -'lf-pod1' 'lf-pod2' 'intel-pod2' 'intel-pod3' \ -'intel-pod5' 'intel-pod6' 'intel-pod7' 'intel-pod8' \ -'ericsson-pod2' \ -'arm-pod1' 'arm-pod3' \ -'huawei-pod1' 'huawei-pod2' 'huawei-virtual1' 'huawei-virtual2' 'huawei-virtual3' 'huawei-virtual4') +'lf-pod1' 'lf-pod2' \ +'lf-virtual2' 'lf-virtual3' \ +'intel-pod12' 'intel-pod18' \ +'ericsson-pod1' 'ericsson-pod2' \ +'ericsson-virtual1' 'ericsson-virtual2' 'ericsson-virtual3' \ +'ericsson-virtual4' 'ericsson-virtual5' \ +'arm-pod5' 'arm-pod6' \ +'huawei-pod1' 'huawei-pod2' 'huawei-pod3' 'huawei-pod4' \ +'huawei-pod6' 'huawei-pod7' 'huawei-pod12' 'huawei-pod8' \ +'huawei-virtual1' 'huawei-virtual2' 'huawei-virtual3' 'huawei-virtual4' \ +'huawei-virtual5' 'huawei-virtual8' 'huawei-virtual9' \ +'zte-pod2' 'zte-pod3' 'zte-pod9' \ +'zte-virtual1') if [[ ! " ${node_list[@]} " =~ " ${testbed} " ]]; then @@ -52,15 +60,15 @@ 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 - echo "Logs can be found in http://artifacts.opnfv.org/logs_${project}_${testbed}.html" + echo "Logs can be found in https://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}" + echo "https://artifacts.opnfv.org/${project_artifact}${f}" done fi fi