vsperf: replace intel-pod3 by intel-pod12

[releng.git] / utils / push-test-logs.sh

diff --git a/utils/push-test-logs.sh b/utils/push-test-logs.sh
index dcfa585..09861c4 100644 (file)
--- a/utils/push-test-logs.sh
+++ b/utils/push-test-logs.sh
@@ -15,9 +15,27 @@ 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"
+dir_result="${HOME}/opnfv/$project/results/${branch}"
+# src: https://wiki.opnfv.org/display/INF/Hardware+Infrastructure
+# + intel-pod12 (vsperf)
+node_list=(\
+'lf-pod1' 'lf-pod2' 'intel-pod2' 'intel-pod12' \
+'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-pod12'\
+'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 +49,25 @@ 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: 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"
+                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
           echo "Result folder is empty"
     fi