diff options
| author | Yuya Kusakabe <yuya.kusakabe@gmail.com> | 2017-01-13 00:01:56 +0900 |
|---|---|---|
| committer | Yuya Kusakabe <yuya.kusakabe@gmail.com> | 2017-01-13 00:01:56 +0900 |
| commit | f8a71b4e31126aa3b7ff0075f4026fb471746c4e (patch) | |
| tree | e083616af026c3aa6f13c49db04ffd2969651402 | |
| parent | 9c73f9d51150361104b25a4047ae3ea192162fd5 (diff) | |
| download | vyos-integration-test-f8a71b4e31126aa3b7ff0075f4026fb471746c4e.tar.gz vyos-integration-test-f8a71b4e31126aa3b7ff0075f4026fb471746c4e.zip | |
Remove .travis.yml
| -rw-r--r-- | .travis.yml | 25 | ||||
| -rwxr-xr-x | setup.sh | 11 | ||||
| -rw-r--r-- | spec/one_node/Vagrantfile | 3 | ||||
| -rw-r--r-- | spec/site_to_site_vpn/Vagrantfile | 3 |
4 files changed, 13 insertions, 29 deletions
diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 7637976..0000000 --- a/.travis.yml +++ /dev/null @@ -1,25 +0,0 @@ -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/setup.sh b/setup.sh new file mode 100755 index 0000000..7077cd3 --- /dev/null +++ b/setup.sh @@ -0,0 +1,11 @@ +#!/bin/bash + +sudo apt-get update +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 diff --git a/spec/one_node/Vagrantfile b/spec/one_node/Vagrantfile index 0c9e6f7..a218807 100644 --- a/spec/one_node/Vagrantfile +++ b/spec/one_node/Vagrantfile @@ -11,8 +11,7 @@ Vagrant.configure('2') do |config| 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' + libvirt.cpu_feature name: 'vmx', policy: 'force' end end configs.keys.each do |host| diff --git a/spec/site_to_site_vpn/Vagrantfile b/spec/site_to_site_vpn/Vagrantfile index 316889f..a218807 100644 --- a/spec/site_to_site_vpn/Vagrantfile +++ b/spec/site_to_site_vpn/Vagrantfile @@ -11,8 +11,7 @@ Vagrant.configure('2') do |config| 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' + libvirt.cpu_feature name: 'vmx', policy: 'force' end end configs.keys.each do |host| |