X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=utils%2Fpush-test-logs.sh;h=0fcea0d7b398ba2477a1156c0ba948772165efe3;hb=abd754f9358035062d977c46b4e9e0a171cf5261;hp=7486adb40054c1960cb368bab1e8749c92e80721;hpb=b182b6d6072916265ececd6f9fb013fdec99698a;p=releng.git

diff --git a/utils/push-test-logs.sh b/utils/push-test-logs.sh
index 7486adb40..0fcea0d7b 100644
--- a/utils/push-test-logs.sh
+++ b/utils/push-test-logs.sh
@@ -15,15 +15,26 @@ 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"
+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' 'huawei-pod1' 'huawei-pod2' 'huawei-virtual1' 'huawei-virtual2' 'huawei-virtual3' 'huawei-virtual4')
+'lf-pod1' 'lf-pod2' 'intel-pod2' 'intel-pod12' \
+'lf-virtual2' 'lf-virtual3' \
+'intel-pod5' 'intel-pod6' 'intel-pod7' 'intel-pod8' 'intel-pod18' \
+'ericsson-pod1' 'ericsson-pod2' \
+'ericsson-virtual1' 'ericsson-virtual2'  'ericsson-virtual3' \
+'ericsson-virtual4' 'ericsson-virtual5' 'ericsson-virtual12' \
+'arm-pod1' 'arm-pod5' 'arm-pod6' \
+'huawei-pod1' 'huawei-pod2' 'huawei-pod3' 'huawei-pod4' 'huawei-pod5' \
+'huawei-pod6' 'huawei-pod7' 'huawei-pod12' \
+'huawei-virtual1' 'huawei-virtual2' 'huawei-virtual3' 'huawei-virtual4' \
+'huawei-virtual5' 'huawei-virtual8' 'huawei-virtual9' \
+'zte-pod2' 'zte-pod3' \
+'zte-virtual1')
+
 
 if [[ ! " ${node_list[@]} " =~ " ${testbed} " ]]; then
     echo "This is not a CI POD. Aborting pushing the logs to artifacts."
@@ -49,10 +60,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