summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryatin <ykarel@redhat.com>2017-05-17 15:59:01 +0530
committeryatin <ykarel@redhat.com>2017-05-18 03:53:47 +0000
commit907eeb28da0a03abb5b1c6702e53a32b576fec29 (patch)
tree8e5f7b3113f9477ced450ff515a0e12650cb21fa
parent1881152217cb42d2e6f761136402572079a72c95 (diff)
Use 'virt_type=kvm' in devstack vm if supported
If the devstack vm supports nested virtualization we should use it. This can done using by setting: DEVSTACK_GATE_LIBVIRT_TYPE=kvm. This will increase the performance in gate jobs. Change-Id: I2439de036dfec2ada3c92c2d4b71c73b5f41a518 (cherry picked from commit 34efcdfcafad3108e54fd4351a414f3a74e1ef6f)
Notes
Notes (review): Code-Review+2: Spyros Trigazis (strigazi) <strigazi@gmail.com> Workflow+1: Spyros Trigazis (strigazi) <strigazi@gmail.com> Code-Review+1: ShangXiao <shangxiaobj@inspur.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Fri, 19 May 2017 08:21:38 +0000 Reviewed-on: https://review.openstack.org/465796 Project: openstack/magnum Branch: refs/heads/stable/ocata
-rwxr-xr-xmagnum/tests/contrib/gate_hook.sh5
1 files changed, 5 insertions, 0 deletions
diff --git a/magnum/tests/contrib/gate_hook.sh b/magnum/tests/contrib/gate_hook.sh
index 5a29715..9490ea3 100755
--- a/magnum/tests/contrib/gate_hook.sh
+++ b/magnum/tests/contrib/gate_hook.sh
@@ -33,6 +33,11 @@ export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ceilometer-alarm-notifier"
33export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ceilometer-api" 33export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ceilometer-api"
34export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ceilometer-collector" 34export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ceilometer-collector"
35 35
36if egrep --quiet '(vmx|svm)' /proc/cpuinfo; then
37 export DEVSTACK_GATE_LIBVIRT_TYPE=kvm
38fi
39
40
36if [ "$coe" = "mesos" ]; then 41if [ "$coe" = "mesos" ]; then
37 export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_GUEST_IMAGE_URL=https://fedorapeople.org/groups/magnum/ubuntu-mesos-ocata.qcow2" 42 export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_GUEST_IMAGE_URL=https://fedorapeople.org/groups/magnum/ubuntu-mesos-ocata.qcow2"
38elif [ "$coe" = "k8s-coreos" ]; then 43elif [ "$coe" = "k8s-coreos" ]; then