Skip to content

Commit 4703464

Browse files
steenzoutsteenzout
authored
Merge pull request #27 from ansiblebit/issue26
Issue26
2 parents b37adbc + f76339c commit 4703464

File tree

6 files changed

+55
-126
lines changed

6 files changed

+55
-126
lines changed

‎README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ DISCLAIMER: usage of any version of this role implies you have accepted the
2222
|:-:|:-:|:-:|:-:|
2323
| Debian | Debian | Jessie | [![x86_64](http://img.shields.io/badge/x86_64-passed-006400.svg?style=flat)](#) |
2424
| Debian | Ubuntu | Precise | [![x86_64](http://img.shields.io/badge/x86_64-passed-006400.svg?style=flat)](#) |
25+
| Debian | Ubuntu | Yakkety | [![x86_64](http://img.shields.io/badge/x86_64-passed-006400.svg?style=flat)](#) |
26+
| Debian | Ubuntu | Xenial | [![x86_64](http://img.shields.io/badge/x86_64-passed-006400.svg?style=flat)](#) |
2527
| Debian | Ubuntu | Trusty | [![x86_64](http://img.shields.io/badge/x86_64-passed-006400.svg?style=flat)](#) |
2628
| Debian | Ubuntu | Vivid | [![x86_64](http://img.shields.io/badge/x86_64-passed-006400.svg?style=flat)](#) |
2729
| Debian | Ubuntu | Wily | [![x86_64](http://img.shields.io/badge/x86_64-passed-006400.svg?style=flat)](#) |

‎meta/main.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ galaxy_info:
2929
- 6
3030
- name: Ubuntu
3131
versions:
32+
- yakkety
33+
- xenial
3234
- vivid
3335
- trusty
3436
- precise

‎tests/Vagrantfile‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ Vagrant.configure('2') do |config|
2626
host.vm.box = box_settings['box'] unless not box_settings.key? 'box'
2727

2828
host.vm.network box_settings['network']['name'], ip: box_settings['network']['ip'] unless box_settings.key? 'network'
29+
host.vm.synced_folder '.', '/vagrant', disabled: true
2930

3031
# puts "[DEBUG] applying virtualbox settings for #{box_name} box..."
3132
customize_args = [ "modifyvm", :id ]
@@ -36,9 +37,25 @@ Vagrant.configure('2') do |config|
3637

3738
# puts "[DEBUG] provision using ansible vagrant playbook..."
3839
host.vm.provision 'ansible' do |ansible|
40+
41+
ansible.host_vars = {
42+
'xenial64.vagrant.dev' => {
43+
'ansible_python_interpreter' => '/usr/bin/python2.7',
44+
'playbook_python2' => true
45+
},
46+
'yakkety64.vagrant.dev' => {
47+
'ansible_python_interpreter' => '/usr/bin/python2.7',
48+
'playbook_python2' => true
49+
}
50+
}
51+
3952
ansible.playbook = PLAYBOOK
4053
ansible.verbose = 'v'
4154
ansible.skip_tags = 'test'
55+
ansible.extra_vars = {
56+
'env': 'vagrant',
57+
'vagrant_box': "#{box_name}"
58+
}
4259
end
4360
end
4461
end

‎tests/boxes.yml‎

Lines changed: 13 additions & 123 deletions
Original file line numberDiff line numberDiff line change
@@ -7,30 +7,6 @@ vagrant:
77

88
# CentOS
99

10-
centos64-64.vagrant.dev:
11-
enabled: false
12-
box: hansode/centos-6.4-x86_64
13-
network:
14-
name: private_network
15-
ip: 192.168.121.1
16-
17-
provider:
18-
virtualbox:
19-
memory: 1024
20-
cpus: 1
21-
22-
centos66-64.vagrant.dev:
23-
enabled: false
24-
box: hansode/centos-6.6-x86_64
25-
network:
26-
name: private_network
27-
ip: 192.168.121.2
28-
29-
provider:
30-
virtualbox:
31-
memory: 1024
32-
cpus: 1
33-
3410
centos7-64.vagrant.dev:
3511
enabled: true
3612
box: centos/7
@@ -58,83 +34,9 @@ vagrant:
5834
memory: 1024
5935
cpus: 1
6036

61-
wheezy64.vagrant.dev:
62-
enabled: false
63-
box: debian/wheezy64
64-
network:
65-
name: private_network
66-
ip: 192.168.122.2
67-
68-
provider:
69-
virtualbox:
70-
memory: 1024
71-
cpus: 1
72-
73-
74-
# Fedora
75-
76-
fedora20-32.vagrant.dev:
77-
enabled: false
78-
box: hansode/fedora-20-i386
79-
network:
80-
name: private_network
81-
ip: 192.168.123.1
82-
83-
provider:
84-
virtualbox:
85-
memory: 1024
86-
cpus: 1
87-
88-
fedora20-64.vagrant.dev:
89-
enabled: false
90-
box: hansode/fedora-20-x86_64
91-
network:
92-
name: private_network
93-
ip: 192.168.123.2
94-
95-
provider:
96-
virtualbox:
97-
memory: 1024
98-
cpus: 1
99-
100-
fedora21-32.vagrant.dev:
101-
enabled: false
102-
box: hansode/fedora-21-i386
103-
network:
104-
name: private_network
105-
ip: 192.168.123.3
106-
107-
provider:
108-
virtualbox:
109-
memory: 1024
110-
cpus: 1
111-
112-
fedora21-64.vagrant.dev:
113-
enabled: false
114-
box: hansode/fedora-21-x86_64
115-
network:
116-
name: private_network
117-
ip: 192.168.123.4
118-
119-
provider:
120-
virtualbox:
121-
memory: 1024
122-
cpus: 1
12337

12438
# Ubuntu
12539

126-
precise32.vagrant.dev:
127-
enabled: true
128-
box: ubuntu/precise32
129-
network:
130-
name: private_network
131-
ip: 192.168.124.1
132-
133-
provider:
134-
virtualbox:
135-
memory: 1024
136-
cpus: 1
137-
13840
precise64.vagrant.dev:
13941
enabled: true
14042
box: ubuntu/precise64
@@ -147,18 +49,6 @@ vagrant:
14749
memory: 1024
14850
cpus: 1
14951

150-
trusty32.vagrant.dev:
151-
enabled: true
152-
box: ubuntu/trusty32
153-
network:
154-
name: private_network
155-
ip: 192.168.124.3
156-
157-
provider:
158-
virtualbox:
159-
memory: 1024
160-
cpus: 1
161-
16252
trusty64.vagrant.dev:
16353
enabled: true
16454
box: ubuntu/trusty64
@@ -171,48 +61,48 @@ vagrant:
17161
memory: 1024
17262
cpus: 1
17363

174-
vivid32.vagrant.dev:
175-
enabled: false
176-
box: ubuntu/vivid32
64+
vivid64.vagrant.dev:
65+
enabled: true
66+
box: ubuntu/vivid64
17767
network:
17868
name: private_network
179-
ip: 192.168.124.5
69+
ip: 192.168.124.6
18070

18171
provider:
18272
virtualbox:
18373
memory: 1024
18474
cpus: 1
18575

186-
vivid64.vagrant.dev:
76+
wily64.vagrant.dev:
18777
enabled: true
18878
box: ubuntu/vivid64
18979
network:
19080
name: private_network
191-
ip: 192.168.124.6
81+
ip: 192.168.124.8
19282

19383
provider:
19484
virtualbox:
19585
memory: 1024
19686
cpus: 1
19787

198-
wily32.vagrant.dev:
199-
enabled: false
200-
box: ubuntu/wily32
88+
xenial64.vagrant.dev:
89+
enabled: true
90+
box: ubuntu/xenial64
20191
network:
20292
name: private_network
203-
ip: 192.168.124.7
93+
ip: 192.168.124.10
20494

20595
provider:
20696
virtualbox:
20797
memory: 1024
20898
cpus: 1
20999

210-
wily64.vagrant.dev:
100+
yakkety64.vagrant.dev:
211101
enabled: true
212-
box: ubuntu/vivid64
102+
box: ubuntu/yakkety64
213103
network:
214104
name: private_network
215-
ip: 192.168.124.8
105+
ip: 192.168.124.12
216106

217107
provider:
218108
virtualbox:

‎tests/test.yml‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,24 @@
11
---
22
# file: oracle-java/tests/test.yml
33

4+
- name: setup python2
5+
hosts: "{{ vagrant_box }}"
6+
gather_facts: no
7+
8+
tasks:
9+
- raw: sudo apt-get update -qq && sudo apt-get install -qq python2.7
10+
when: playbook_python2 is defined and
11+
playbook_python2
12+
13+
414
- name: tests play
515
hosts: all
616
gather_facts: yes
717

818
vars:
919
debug: yes
1020
test_java_version: 8
11-
test_java_version_update: 91
21+
test_java_version_update: 101
1222
test_java_version_build: 14
1323

1424
roles:

‎tests/vagrant.sh‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# Bash script to run the test suite against the Vagrant environment.
55
#
6-
# version: 1.2
6+
# version: 1.8
77
#
88
# usage:
99
#
@@ -16,6 +16,12 @@
1616
#
1717
# changelog:
1818
#
19+
# v1.8 : 10 August 2016
20+
# - force provisioning
21+
#
22+
# v1.6 : 10 Jun 2016
23+
# - exit if USER environment variable is travis
24+
#
1925
# v1.4 : 10 Jul 2015
2026
# - remove environment variable ANSIBLE_ASK_SUDO_PASS
2127
#
@@ -24,6 +30,8 @@
2430
#
2531
# #################
2632

33+
test $USER == 'travis' && exit 0
34+
2735
DIR="$(dirname "$0")"
2836

2937
cd $DIR
@@ -56,7 +64,7 @@ do
5664
if [ ! -n "${BOX+1}" ] || [ "${BOX}" = "${VAGRANT_BOX}" ]; then
5765

5866
echo "[INFO] preparing ${VAGRANT_BOX}..."
59-
vagrant up ${VAGRANT_BOX} 2> /dev/null
67+
vagrant up --provision ${VAGRANT_BOX} 2> /dev/null
6068
if [ $? -ne 0 ]; then
6169
# box not enabled
6270
continue

0 commit comments

Comments
 (0)