diff options
Diffstat (limited to 'ci')
| -rw-r--r-- | ci/apex.conf | 4 | ||||
| -rwxr-xr-x | ci/envs/cyclictest.sh | 7 | ||||
| -rwxr-xr-x | ci/envs/host-config | 2 | ||||
| -rwxr-xr-x | ci/test_kvmfornfv.sh | 2 |
4 files changed, 12 insertions, 3 deletions
diff --git a/ci/apex.conf b/ci/apex.conf index 03e5830bc..99b11e07f 100644 --- a/ci/apex.conf +++ b/ci/apex.conf @@ -1,2 +1,2 @@ -branch=stable/danube -commit_id=977317100f3b52caafb091ad5924e5dd81982433 +branch=master +commit_id=b6b08d2a80b2df28e496ce87705593ed59b282a3 diff --git a/ci/envs/cyclictest.sh b/ci/envs/cyclictest.sh index 920a46b93..d1ae5c7fa 100755 --- a/ci/envs/cyclictest.sh +++ b/ci/envs/cyclictest.sh @@ -11,6 +11,7 @@ testName=$2 #idle_idle/stress_idle HOST_IP=$( getHostIP ) pod_config='/opt/scripts/pod.yaml' cyclictest_context_file='/opt/kvmfornfv_cyclictest_'${testName}'.yaml' +yardstick_prefix='/root/yardstick/yardstick/benchmark/scenarios/compute' # yardstick teardown path if [ ! -f ${pod_config} ] ; then echo "file ${pod_config} not found" @@ -22,6 +23,12 @@ if [ ! -f ${cyclictest_context_file} ] ; then exit 1 fi +#As yardstick executes only *.bash scripts, copy the post-execute script as .bash script +cp /opt/scripts/disable_trace.sh ${yardstick_prefix}/disable_trace.bash + +#Execution of the post-execute script copied requires re-installation of yardstick +( cd /root/yardstick ; python setup.py install ) + #setting up of image for launching guest vm. ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null \ root@$HOST_IP "cp /root/images/guest1.qcow2 /root/" diff --git a/ci/envs/host-config b/ci/envs/host-config index 2ad4b3eb7..54d262af4 100755 --- a/ci/envs/host-config +++ b/ci/envs/host-config @@ -52,7 +52,7 @@ function setHostIP { function setTestTime { test_type=$1 if [ ${test_type} == "verify" ];then - test_time=1000 # 1s + test_time=120000 # 2m elif [ ${test_type} == "daily" ];then test_time=3600000 # 1hr else diff --git a/ci/test_kvmfornfv.sh b/ci/test_kvmfornfv.sh index 92f422827..b1aa97390 100755 --- a/ci/test_kvmfornfv.sh +++ b/ci/test_kvmfornfv.sh @@ -140,6 +140,8 @@ if [ ${test_type} == "verify" ];then test_exit 0 fi elif [ ${test_type} == "daily" ];then + echo "Daily job test cases execution disabled temporarily" + exit 0 getTestParams install_pcm if [ ${test_name} == "packet_forward" ];then |