This patch contains updated Dockerfile to modify SSH Timeout value

for the execution of cyclictest through yardstick

Change-Id: I382408d0f462c05f3f9b6578b3e00d104d127ee7
Co-Authored-By: Shravani <shravani.p@tcs.com>
Signed-off-by: Gundarapu Kalyan Reddy <reddyx.gundarapu@intel.com>

diff --git a/ci/envs/cyclictest.sh b/ci/envs/cyclictest.sh
index 4c5440d..2af22af 100755 (executable)
--- a/ci/envs/cyclictest.sh
+++ b/ci/envs/cyclictest.sh
@@ -21,7 +21,8 @@ if [ ! -f ${cyclictest_context_file} ] ; then
 fi
 
 #setting up of image for launching guest vm.
-sudo ssh root@$HOST_IP "cp /root/images/guest1.qcow2 /root/"
+ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null \
+root@$HOST_IP "cp /root/images/guest1.qcow2 /root/"
 
 #Running cyclictest through yardstick
 yardstick -d task start ${cyclictest_context_file}

diff --git a/docker_image_build/Dockerfile b/docker_image_build/Dockerfile
index fd1ea58..fa71954 100644 (file)
--- a/docker_image_build/Dockerfile
+++ b/docker_image_build/Dockerfile
@@ -5,5 +5,7 @@
 #
 FROM kvmfornfv1:latest
 RUN cd /root && git clone https://gerrit.opnfv.org/gerrit/p/yardstick.git -b stable/colorado
+RUN var=`grep "loops" /root/yardstick/samples/cyclictest-node-context.yaml |awk '{ print $2/1000 }'`; \
+    sed -i -e "s/3600/$((var+1500))/g" /root/yardstick/yardstick/ssh.py
 RUN cd /root/yardstick && python setup.py install
 WORKDIR /root