summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSerena Feng <feng.xiaowei@zte.com.cn>2017-03-14 10:09:25 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-03-14 10:09:25 +0000
commit650d1436e7e199269eb66c4b3938297150e85414 (patch)
treecdf998471ecc54e9ce7ed7ef87d5cb7006a2bc75
parentd89f1101a15c140d91cf4b3b3a9218f8e658f314 (diff)
parent535fcd541dff163356b4d0094b9e741fe8a030f0 (diff)
Merge "[qtip]execute compute qpi in qtip daily job"
-rw-r--r--jjb/qtip/helpers/validate-deploy.sh12
-rw-r--r--jjb/qtip/qtip-validate-jobs.yml4
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 2be9d6231..4cd8490fd 100644
--- a/jjb/qtip/qtip-validate-jobs.yml
+++ b/jjb/qtip/qtip-validate-jobs.yml
@@ -61,6 +61,10 @@
<<: *master
- '{installer}-defaults'
- '{pod}-defaults'
+ - string:
+ name: CI_DEBUG
+ default: 'false'
+ description: "Show debug output information"
scm:
- git-scm
triggers: