X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fqtip%2Fhelpers%2Fvalidate-deploy.sh;h=af8f8c200c8fa6e0bbb503cc197b0ac24a93741f;hb=d36c8831a33f0c91d5eec8817ba835393406d6bd;hp=a73e33c2cf00d18f9c583890f779a69c29997190;hpb=325f0012af3b439ab8d124d89641f80a26598edb;p=releng.git

diff --git a/jjb/qtip/helpers/validate-deploy.sh b/jjb/qtip/helpers/validate-deploy.sh
index a73e33c2c..af8f8c200 100644
--- a/jjb/qtip/helpers/validate-deploy.sh
+++ b/jjb/qtip/helpers/validate-deploy.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 ##############################################################################
-# Copyright (c) 2016 ZTE and others.
+# Copyright (c) 2017 ZTE and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Apache License, Version 2.0
 # which accompanies this distribution, and is available at
@@ -8,18 +8,18 @@
 ##############################################################################
 set -e
 
-envs="INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP}
--e NODE_NAME=${NODE_NAME} -e CI_DEBUG=${CI_DEBUG}"
-dir_imgstore="${HOME}/imgstore"
-
 echo "--------------------------------------------------------"
 echo "POD: $NODE_NAME"
-echo "INSTALLER: $INSTALLER_TYPE"
 echo "Scenario: $DEPLOY_SCENARIO"
+echo "INSTALLER: $INSTALLER_TYPE"
+echo "INSTALLER_IP: $INSTALLER_IP"
 echo "--------------------------------------------------------"
 
 echo "Qtip: Pulling docker image: opnfv/qtip:${DOCKER_TAG}"
-docker pull opnfv/qtip:$DOCKER_TAG
+docker pull opnfv/qtip:$DOCKER_TAG >/dev/null
+
+envs="INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP}
+-e POD_NAME=${NODE_NAME} -e SCENARIO=${DEPLOY_SCENARIO}"
 
 cmd=" docker run -id -e $envs opnfv/qtip:${DOCKER_TAG} /bin/bash"
 echo "Qtip: Running docker command: ${cmd}"
@@ -29,13 +29,12 @@ container_id=$(docker ps | grep "opnfv/qtip:${DOCKER_TAG}" | awk '{print $1}' |
 if [ $(docker ps | grep 'opnfv/qtip' | wc -l) == 0 ]; then
     echo "The container opnfv/qtip with ID=${container_id} has not been properly started. Exiting..."
     exit 1
-else
-    echo "The container ID is: ${container_id}"
-    QTIP_REPO=/home/opnfv/repos/qtip
-# 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 "The container ID is: ${container_id}"
+QTIP_REPO=/home/opnfv/repos/qtip
+
+docker exec -t ${container_id} bash -c "bash ${QTIP_REPO}/tests/ci/run_ci.sh"
+
 echo "Qtip done!"
+exit 0
\ No newline at end of file