X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=utils%2Fpush-test-logs.sh;h=f24d884f5300581aef1029d1dda4935aebf26914;hb=17c580ad155f3256c86ceb078aee2cf8512a072e;hp=331cbd9428ee6908728e8a3ad77892a936f67e7f;hpb=7d07e223f5a5ff18de1bc83377b7be345a2ef01f;p=releng.git

diff --git a/utils/push-test-logs.sh b/utils/push-test-logs.sh
index 331cbd942..f24d884f5 100644
--- a/utils/push-test-logs.sh
+++ b/utils/push-test-logs.sh
@@ -17,7 +17,21 @@ 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=(\
+'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')
+
+
+if [[ ! " ${node_list[@]} " =~ " ${testbed} " ]]; then
+    echo "This is not a CI POD. Aborting pushing the logs to artifacts."
+    exit 0
+fi
 
 if [[ "$branch" == "master" ]]; then
     project_artifact=logs/$project/$testbed/$res_build_date
@@ -36,12 +50,18 @@ if [ -d "$dir_result" ]; then
         if [ $? != 0 ]; then
             echo "Not possible to push results to artifact: gsutil not installed";
         else
-            gsutil ls gs://artifacts.opnfv.org/"$project_artifact"/ &>/dev/null
+            gsutil ls gs://artifacts.opnfv.org/"$project"/ &>/dev/null
             if [ $? != 0 ]; then
-                echo "Not possible to push results to artifact: wrong credentials.";
+                echo "Not possible to push results to artifact: gsutil not installed.";
             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