From 535fcd541dff163356b4d0094b9e741fe8a030f0 Mon Sep 17 00:00:00 2001
From: "wu.zhihui" <wu.zhihui1@zte.com.cn>
Date: Mon, 13 Mar 2017 16:40:07 +0800
Subject: [qtip]execute compute qpi in qtip daily job

- Execute compute qpi in qtip daily job.
- delete unuse parameter
- add CI_DEBUG parameter

Change-Id: I0e429703b7d1ac8cc7fda2ec888de789b57a5e50
Signed-off-by: wu.zhihui <wu.zhihui1@zte.com.cn>
---
 jjb/qtip/helpers/validate-deploy.sh | 12 +++++++-----
 jjb/qtip/qtip-validate-jobs.yml     |  4 ++++
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/jjb/qtip/helpers/validate-deploy.sh b/jjb/qtip/helpers/validate-deploy.sh
index 16455371f..90b54a1c9 100644
--- a/jjb/qtip/helpers/validate-deploy.sh
+++ b/jjb/qtip/helpers/validate-deploy.sh
@@ -8,15 +8,14 @@
 ##############################################################################
 set -e
 
-envs="INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP} -e NODE_NAME=${NODE_NAME}"
-suite="TEST_CASE=all"
+envs="INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP}
+-e NODE_NAME=${NODE_NAME} -e CI_DEBUG=${CI_DEBUG}"
 dir_imgstore="${HOME}/imgstore"
-img_volume="${dir_imgstore}:/home/opnfv/imgstore"
 
 echo "Qtip: Pulling docker image: opnfv/qtip:${DOCKER_TAG}"
 docker pull opnfv/qtip:$DOCKER_TAG
 
-cmd=" docker run -id -e $envs -e $suite -v ${img_volume} opnfv/qtip:${DOCKER_TAG} /bin/bash"
+cmd=" docker run -id -e $envs opnfv/qtip:${DOCKER_TAG} /bin/bash"
 echo "Qtip: Running docker command: ${cmd}"
 ${cmd}
 
@@ -27,7 +26,10 @@ if [ $(docker ps | grep 'opnfv/qtip' | wc -l) == 0 ]; then
 else
     echo "The container ID is: ${container_id}"
     QTIP_REPO=/home/opnfv/repos/qtip
-# TODO(yujunz): execute benchmark plan for compute-qpi
+# TODO(zhihui_wu): use qtip cli to execute benchmark test in the future
+    docker exec -t ${container_id} bash -c "cd ${QTIP_REPO}/qtip/runner/ &&
+    python runner.py -d /home/opnfv/qtip/results/ -b all"
+
 fi
 
 echo "Qtip done!"
diff --git a/jjb/qtip/qtip-validate-jobs.yml b/jjb/qtip/qtip-validate-jobs.yml
index 10ee72a8b..c4fd91675 100644
--- a/jjb/qtip/qtip-validate-jobs.yml
+++ b/jjb/qtip/qtip-validate-jobs.yml
@@ -53,6 +53,10 @@
             <<: *master
         - '{installer}-defaults'
         - '{pod}-defaults'
+        - string:
+            name: CI_DEBUG
+            default: 'false'
+            description: "Show debug output information"
     scm:
         - git-scm
     triggers:
-- 
cgit 1.2.3-korg