X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=utils%2Fpush-test-logs.sh;h=8a4bbc3fcc57b915c3b5f39b38d91785b5df49b5;hb=f4e38a50abf73078e6b20b758a6e1be675705360;hp=dcfa585d4854a1f9040f6a2f326ca30c4198ddbb;hpb=8d475dd41bf7906aabefc8ca6359d2016b59066f;p=releng.git

diff --git a/utils/push-test-logs.sh b/utils/push-test-logs.sh
index dcfa585d4..8a4bbc3fc 100644
--- a/utils/push-test-logs.sh
+++ b/utils/push-test-logs.sh
@@ -17,7 +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=(\
+'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'
+
+
+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
@@ -31,12 +44,19 @@ mkdir -p $dir_result
 # copy folder to artifact
 if [ -d "$dir_result" ]; then
     if [ "$(ls -A $dir_result)" ]; then
-          echo "copy result files to artifact $project_artifact"
-          gsutil -m cp -r "$dir_result" gs://artifacts.opnfv.org/"$project_artifact"/
-
-          # delete local results
-          # should not be useful as the container is about to die...just in case
-          rm -Rf $dir_result/*
+        set +e
+        gsutil&>/dev/null
+        if [ $? != 0 ]; then
+            echo "Not possible to push results to artifact: gsutil not installed";
+        else
+            gsutil ls gs://artifacts.opnfv.org/"$project"/ &>/dev/null
+            if [ $? != 0 ]; then
+                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"/
+            fi
+        fi
     else
           echo "Result folder is empty"
     fi