Merge pull request #30 from ansiblebit/develop

v17

Author: steenzout

.travis.yml

@@ -26,13 +26,13 @@ notifications:
  - "%{elapsed_time} : %{duration}"
  - "%{message}"
  rooms:
- secure: NfmAKh32+3VjdHPcckTb2WKFLHmDeDXg18RCFTNquntOkrE5WKvwdUgH+5mtgIw6sP06OuyRgCBmrOj4zNAvbNU0ltTWDg974TREluQ7LCraIPVX07arY3TjvCjZvp9dtdbSm5G2GiVIEb2Eq2PZDBXYh+yYRXJO7hDFfy3tRoI=
+ secure: NnbcOuvDwjTK1orHxC/LyRhuRZghPt8kliCGBpvBh4exKrr8XjFMoStAOKwu/9KzKDeKzufDTVP4QGNYVp7aQZnTQwJapNTShA47ffAKVAyw9qjGzmOofp3yCo7G9qvAzfeL+E7+4ssnH6Kp1wq1GT79deevl15IjAkzYiRTlUk=
  on_success: always
  on_failure: always
  webhooks: https://galaxy.ansible.com/api/v1/notifications/
 
 before_cache:
- - find ${HOME}/.pip -name log -o -name __pycache__ -type d | xargs -I {} rm -rf {}
+ - rm -f ${HOME}/.cache/pip/log/debug.log
 
 cache:
  directories:

tests/Vagrantfile

@@ -30,7 +30,7 @@ Vagrant.configure('2') do |config|
 
  # puts "[DEBUG] applying virtualbox settings for #{box_name} box..."
  customize_args = [ "modifyvm", :id ]
- box_settings['provider']['virtualbox'].collect { |k, v| customize_args |= ["--#{k}", v.to_s] }
+ vagrant_environment['provider']['virtualbox'].collect { |k, v| customize_args |= ["--#{k}", v.to_s] }
  host.vm.provider 'virtualbox' do |vb|
  vb.customize customize_args
  end

tests/boxes.yml

@@ -2,6 +2,12 @@
 # file: primogen/tests/boxes.yml
 #
 
+provider:
+ virtualbox:
+ memory: 1024
+ cpus: 1
+
+
 vagrant:
 
 
@@ -14,35 +20,20 @@ vagrant:
  name: private_network
  ip: 192.168.121.1
 
- provider:
- virtualbox:
- memory: 1024
- cpus: 1
-
  centos66-64.vagrant.dev:
  enabled: false
  box: hansode/centos-6.6-x86_64
  network:
  name: private_network
  ip: 192.168.121.2
 
- provider:
- virtualbox:
- memory: 1024
- cpus: 1
-
  centos7-64.vagrant.dev:
  enabled: false
  box: relativkreativ/centos-7-minimal
  network:
  name: private_network
  ip: 192.168.121.3
 
- provider:
- virtualbox:
- memory: 1024
- cpus: 1
-
 
  # Debian
 
@@ -80,70 +71,57 @@ vagrant:
  name: private_network
  ip: 192.168.123.1
 
- provider:
- virtualbox:
- memory: 1024
- cpus: 1
-
  fedora20-64.vagrant.dev:
  enabled: false
  box: hansode/fedora-20-x86_64
  network:
  name: private_network
  ip: 192.168.123.2
 
- provider:
- virtualbox:
- memory: 1024
- cpus: 1
-
  fedora21-32.vagrant.dev:
  enabled: false
  box: hansode/fedora-21-i386
  network:
  name: private_network
  ip: 192.168.123.3
 
- provider:
- virtualbox:
- memory: 1024
- cpus: 1
-
  fedora21-64.vagrant.dev:
  enabled: false
  box: hansode/fedora-21-x86_64
  network:
  name: private_network
  ip: 192.168.123.4
 
- provider:
- virtualbox:
- memory: 1024
- cpus: 1
-
  fedora23-atomic.vagrant.dev:
  enabled: false
  box: fedora/23-atomic-host
  network:
  name: private_network
  ip: 192.168.123.5
 
- provider:
- virtualbox:
- memory: 1024
- cpus: 1
-
  fedora23-cloud.vagrant.dev:
  enabled: false
  box: fedora/23-cloud-base
  network:
  name: private_network
  ip: 192.168.123.6
 
- provider:
- virtualbox:
- memory: 1024
- cpus: 1
+
+ # OpenSUSE
+
+ leap64.vagrant.dev:
+ enabled: false
+ box: opensuse/openSUSE-42.1-x86_64
+ network:
+ name: private_network
+ ip: 192.168.125.2
+
+ tumbleweed64.vagrant.dev:
+ enabled: false
+ box: opensuse/openSUSE-Tumbleweed-x86_64
+ network:
+ name: private_network
+ ip: 192.168.125.4
 
 
  # Ubuntu
@@ -155,103 +133,58 @@ vagrant:
  name: private_network
  ip: 192.168.124.1
 
- provider:
- virtualbox:
- memory: 1024
- cpus: 1
-
  precise64.vagrant.dev:
  enabled: false
  box: ubuntu/precise64
  network:
  name: private_network
  ip: 192.168.124.2
 
- provider:
- virtualbox:
- memory: 1024
- cpus: 1
-
  trusty32.vagrant.dev:
  enabled: false
  box: ubuntu/trusty32
  network:
  name: private_network
  ip: 192.168.124.3
 
- provider:
- virtualbox:
- memory: 1024
- cpus: 1
-
  trusty64.vagrant.dev:
  enabled: false
  box: ubuntu/trusty64
  network:
  name: private_network
  ip: 192.168.124.4
 
- provider:
- virtualbox:
- memory: 1024
- cpus: 1
-
  vivid32.vagrant.dev:
  enabled: false
  box: ubuntu/vivid32
  network:
  name: private_network
  ip: 192.168.124.5
 
- provider:
- virtualbox:
- memory: 1024
- cpus: 1
-
  vivid64.vagrant.dev:
  enabled: false
  box: ubuntu/vivid64
  network:
  name: private_network
  ip: 192.168.124.6
 
- provider:
- virtualbox:
- memory: 1024
- cpus: 1
-
  wily64.vagrant.dev:
  enabled: true
  box: ubuntu/wily64
  network:
  name: private_network
  ip: 192.168.124.7
 
- provider:
- virtualbox:
- memory: 1024
- cpus: 1
-
  xenial64.vagrant.dev:
  enabled: true
  box: ubuntu/xenial64
  network:
  name: private_network
  ip: 192.168.124.8
 
- provider:
- virtualbox:
- memory: 1024
- cpus: 1
-
  yakkety64.vagrant.dev:
  enabled: true
  box: ubuntu/yakkety64
  network:
  name: private_network
  ip: 192.168.124.9
-
- provider:
- virtualbox:
- memory: 1024
- cpus: 1