summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYujun Zhang <zhang.yujunz@zte.com.cn>2017-08-18 08:59:33 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-08-18 08:59:33 +0000
commit3c672cfb23e34e030a8654a8628a6351b1135c8c (patch)
tree79d817fff6c081b6506f65c97c68159584aed4b9
parent84ea7388ecb34034f7c6886886c46b00afc82c2c (diff)
parent94cfd0732b6e8ae95d2def807dad302c92c03d42 (diff)
Merge "Fix compute CI job"
-rwxr-xr-xtests/ci/periodic.sh11
1 files changed, 2 insertions, 9 deletions
diff --git a/tests/ci/periodic.sh b/tests/ci/periodic.sh
index 4235cdee..3f5fe784 100755
--- a/tests/ci/periodic.sh
+++ b/tests/ci/periodic.sh
@@ -45,9 +45,9 @@ echo "Qtip: Pulling docker image: opnfv/qtip:${DOCKER_TAG}"
docker pull opnfv/qtip:$DOCKER_TAG >/dev/null
envs="--env-file $WORKSPACE/env_file"
-docker_volume="-v /var/run/docker.sock:/var/run/docker.sock"
+vols="-v /root/.ssh:/root/.ssh"
-cmd="docker run -id ${envs} ${docker_volume} opnfv/qtip:${DOCKER_TAG} /bin/bash"
+cmd="sudo docker run -id ${envs} ${vols} opnfv/qtip:${DOCKER_TAG} /bin/bash"
echo "Qtip: Running docker command: ${cmd}"
${cmd}
@@ -60,13 +60,6 @@ fi
echo "The container ID is: ${container_id}"
QTIP_REPO=/home/opnfv/repos/qtip
-if [[ "$INSTALLER_TYPE" == "apex" ]];then
- if [ -f /root/.ssh/id_rsa ]; then
- sudo chmod 600 /root/.ssh/id_rsa
- sudo docker cp /root/.ssh/id_rsa ${container_id}:/root/.ssh/
- fi
-fi
-
case $TEST_SUITE in
compute)
docker exec -t ${container_id} bash -c "bash ${QTIP_REPO}/tests/ci/run_compute_qpi.sh"