From ff4f5af5548a7e333362829892c709ee14489da0 Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Mon, 2 Jan 2017 09:00:06 +0200
Subject: [PATCH] - Try using Vagrant with software virtualization.
---
.travis.yml | 12 +++++++++---
molecule.yml | 16 +++++++++++-----
2 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index abc583a..60e4a02 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,22 +2,28 @@
language: python
python: "2.7"
dist: trusty
-sudo: false
+sudo: True
group: beta
-services: [docker]
+env:
+ - platform: openbsd
+ - platform: xenial
cache:
- pip
- directories:
- $HOME/.pre-commit
install:
+ - sudo apt-get update
+ - sudo apt-get install -y linux-headers-$(uname -r) virtualbox
+ - wget https://releases.hashicorp.com/vagrant/1.9.1/vagrant_1.9.1_x86_64.deb
+ - sudo dpkg -i vagrant_1.9.1_x86_64.deb
- pip install -r tests/requirements.txt | cat
- ansible-galaxy install git+file://$(pwd),$(git rev-parse --abbrev-ref HEAD) -p .molecule/roles
- molecule dependency
script:
- pre-commit run --all-files
- - molecule test --driver docker
+ - molecule test --platform $platform
notifications:
webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/molecule.yml b/molecule.yml
index 792e630..9b2da0d 100644
--- a/molecule.yml
+++ b/molecule.yml
@@ -13,20 +13,26 @@ vagrant:
providers:
- name: virtualbox
type: virtualbox
+ options:
+ cpus: 1
platforms:
- name: openbsd
- box: kaorimatz/openbsd-6.0-amd64
+ box: fnichol/openbsd-6.0-i386
- name: xenial
- box: ubuntu/xenial64
+ box: ubuntu/xenial32
instances:
- name: example
options:
append_platform_to_hostname: yes
raw_config_args:
- 'vm.synced_folder ".", "/vagrant", disabled: true'
- - 'vbguest.auto_update = false'
- - 'landrush.enabled = false'
- - 'landrush_ip.override = false'
+ - 'vbguest.auto_update = false if Vagrant.has_plugin?("vbguest")'
+ - 'landrush.enabled = false if Vagrant.has_plugin?("landrush")'
+ - 'landrush_ip.override = false if Vagrant.has_plugin?("landrush")'
+ - |
+ vm.provider "virtualbox" do |v|
+ v.customize "pre-boot", ["modifyvm", :id, "--hwvirtex", "off"]
+ end
docker:
containers:
--
GitLab