diff options
| author |   Jiang, Yunhong <yunhong.jiang@intel.com> | 2016-09-21 23:09:58 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-09-21 23:09:58 +0000 |
| commit | 1e8736aefffd6a42ed3700cb22a6a97c7468a02c (patch) | |
| tree | 655f33172b35ab80000084012462bb79e9f03568 /ci/envs | |
| parent | 8647dbbe9db84d71610f42cec6ff619783d99800 (diff) | |
| parent | 40a5f2a48ab343bf24a69af2b1b8bcd09798be3c (diff) | |
Merge "This patch includes scripts to verify the sha512sum of the guest image. Also contains scripts to exit the test if the test_type is not verify/daily/merge."
Diffstat (limited to 'ci/envs')
| -rwxr-xr-x | ci/envs/cyclictest.sh | 7 | ||||
| -rwxr-xr-x | ci/envs/utils.sh | 8 |
2 files changed, 13 insertions, 2 deletions
diff --git a/ci/envs/cyclictest.sh b/ci/envs/cyclictest.sh index 747f34758..4c5440d71 100755 --- a/ci/envs/cyclictest.sh +++ b/ci/envs/cyclictest.sh @@ -7,7 +7,7 @@ source utils.sh HOST_IP=$( getHostIP ) -pod_config='/opt/pod.yaml' +pod_config='/opt/scripts/pod.yaml' cyclictest_context_file='/opt/cyclictest-node-context.yaml' if [ ! -f ${pod_config} ] ; then @@ -25,5 +25,10 @@ sudo ssh root@$HOST_IP "cp /root/images/guest1.qcow2 /root/" #Running cyclictest through yardstick yardstick -d task start ${cyclictest_context_file} +output=$? chmod 777 /tmp/yardstick.out cat /tmp/yardstick.out > /opt/yardstick.out +if [ $output != 0 ];then + echo "Someproblem with execution of Yardstick" + exit 1 +fi diff --git a/ci/envs/utils.sh b/ci/envs/utils.sh index f582b5aac..5db55bef8 100755 --- a/ci/envs/utils.sh +++ b/ci/envs/utils.sh @@ -18,6 +18,12 @@ function getKernelVersion { #Get the IP address from pod.yaml file (example ip : 10.2.117.23) function getHostIP { - HOST_IP=`grep 'ip' $WORKSPACE/tests/pod.yaml | awk -F ': ' '{print $NF}' | tail -1` + host_dir="/root/workspace/scripts/" + container_dir="/opt/scripts/" + if [ -d "$container_dir" ];then + HOST_IP=`grep 'ip' $container_dir/pod.yaml | awk -F ': ' '{print $NF}' | tail -1` + elif [ -d "$host_dir" ];then + HOST_IP=`grep 'ip' $host_dir/pod.yaml | awk -F ': ' '{print $NF}' | tail -1` + fi echo $HOST_IP } |