From 9c73f9d51150361104b25a4047ae3ea192162fd5 Mon Sep 17 00:00:00 2001 From: Yuya Kusakabe Date: Thu, 12 Jan 2017 12:10:32 +0900 Subject: Add .travis.yml --- .travis.yml | 25 +++++++++++++++++++++++++ spec/one_node/Vagrantfile | 11 ++++++++++- spec/site_to_site_vpn/Vagrantfile | 11 ++++++++++- 3 files changed, 45 insertions(+), 2 deletions(-) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..7637976 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,25 @@ +language: ruby +cache: + - apt + - bundler + - directories: + - $HOME/.vagrant.d +os: linux +dist: trusty +sudo: require + +before_install: + - sudo apt-get update + +install: + - sudo apt-get -qqy build-dep vagrant ruby-libvirt + - sudo apt-get -qqy install qemu-system-x86 libvirt-bin ebtables dnsmasq + - sudo apt-get -qqy install libxslt-dev libxml2-dev libvirt-dev zlib1g-dev ruby-dev + - sudo adduser $USER libvirtd + - wget https://releases.hashicorp.com/vagrant/1.8.7/vagrant_1.8.7_x86_64.deb && sudo dpkg -i vagrant_1.8.7_x86_64.deb + - vagrant plugin install vagrant-vyos + - vagrant plugin install vagrant-libvirt + - bundle install --jobs=3 --retry=3 + +script: + - sudo -E su $USER -c "PATH=$PATH rake spec" diff --git a/spec/one_node/Vagrantfile b/spec/one_node/Vagrantfile index bfa380c..0c9e6f7 100644 --- a/spec/one_node/Vagrantfile +++ b/spec/one_node/Vagrantfile @@ -4,7 +4,16 @@ configs = YAML.load_file('config.yaml') Vagrant.configure('2') do |config| config.vm.provider :libvirt do |libvirt| - libvirt.cpu_mode = 'host-passthrough' + cpuinfo = File.read('/proc/cpuinfo') + if cpuinfo =~ /vmx|svm/ + libvirt.cpu_mode = 'host-passthrough' + else + libvirt.driver = 'qemu' + libvirt.cpu_mode = 'custom' + libvirt.cpu_model = 'Nehalem' + libvirt.cpu_feature name: 'svm', policy: 'disable' +# libvirt.cpu_feature name: 'vmx', policy: 'force' + end end configs.keys.each do |host| config.vm.define host.to_sym do |c| diff --git a/spec/site_to_site_vpn/Vagrantfile b/spec/site_to_site_vpn/Vagrantfile index bfa380c..316889f 100644 --- a/spec/site_to_site_vpn/Vagrantfile +++ b/spec/site_to_site_vpn/Vagrantfile @@ -4,7 +4,16 @@ configs = YAML.load_file('config.yaml') Vagrant.configure('2') do |config| config.vm.provider :libvirt do |libvirt| - libvirt.cpu_mode = 'host-passthrough' + cpuinfo = File.read('/proc/cpuinfo') + if cpuinfo =~ /vmx|svm/ + libvirt.cpu_mode = 'host-passthrough' + else + libvirt.driver = 'qemu' + libvirt.cpu_mode = 'custom' + libvirt.cpu_model = 'Nehalem' + libvirt.cpu_feature name: 'svm', policy: 'disable' + #libvirt.cpu_feature name: 'vmx', policy: 'force' + end end configs.keys.each do |host| config.vm.define host.to_sym do |c| -- cgit v1.2.3