From: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
Date: Fri, 11 Dec 2015 10:04:16 +0000 (+0000)
Subject: Merge "Add zte slave to pod-config"
X-Git-Tag: test-tag~79
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=a8f7054c6691852c58c0fd68961a4302c101e20c;hp=200a88d9e6af0bf6ab6c23bac86c144a3daa4f3c;p=releng.git

Merge "Add zte slave to pod-config"
---

diff --git a/jjb/functest/functest.yml b/jjb/functest/functest.yml
index b8de928c2..d1e8f262c 100644
--- a/jjb/functest/functest.yml
+++ b/jjb/functest/functest.yml
@@ -404,7 +404,7 @@
             description: "Override GIT_BASE"
         - string:
             name: LAB_CONFIG
-            default: "/joid/ci/odl/juju-deployer/scripts/cloud/"
+            default: "/home/ubuntu/joid_config/admin-openrc"
             description: "Openstack credentials on the dev lab"
 
 - parameter:
diff --git a/jjb/functest/res-build.sh b/jjb/functest/res-build.sh
index 304d2cc34..a9c5dbe1b 100644
--- a/jjb/functest/res-build.sh
+++ b/jjb/functest/res-build.sh
@@ -2,25 +2,35 @@
 set -e
 set -o pipefail
 
-project="$(git remote -v | head -n1 | awk '{{print $2}}' | sed -e 's,.*:\(.*/\)\?,,' -e 's/\.git$//')"
 export PATH=$PATH:/usr/local/bin/
 
 git_sha1="$(git rev-parse HEAD)"
 res_build_date=$(date -u +"%Y-%m-%d_%H-%M-%S")
 
-# set once, functe config file could be use to avoid such hardcoded path
-dir_result="$HOME/functest/results"
+# Result directory in the docker file
+# to be used only with CI
+dir_result="/home/opnfv/functest/results"
+
+# Clean the results directory
+# remove json file for rally, export only html
+# json should have been pushed into the DB
+rm -f $dir_result/rally/*.json
 
 # Several information are required: date and testbed
 # date is generated by functest so on the artifact, the results shall be under functest/<testbed id>/date/
-testbed="$(hostname)"
-project_artifact=$project/$testbed/$res_build_date
+testbed=$NODE_NAME
+
+project_artifact=functest/$testbed/$res_build_date
 
 # copy folder to artifact
 if [ -d "$dir_result" ]; then
     if [ "$(ls -A $dir_result)" ]; then
           echo "copy result files to artifact $project_artifact"
-          gsutil cp -r "$dir_result" gs://artifacts.opnfv.org/"$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 /home/opnfv/functest/results/*
     else
           echo "Result folder is empty"
     fi