Skip to content

Commit 15fd169

Browse files
committed
update common travis.yml, kitchen.yml platforms
updating common files with changes that are configured in the profiles: travis.yml, kitchen.yml platforms
1 parent 5e6cd42 commit 15fd169

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

.kitchen.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ platforms:
2121
driver_config:
2222
box: opscode-centos-6.5
2323
box_url: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-6.5_chef-provisionerless.box
24-
# - name: oracle-6.4
25-
# driver_config:
26-
# box: oracle-6.4
27-
# box_url: https://storage.us2.oraclecloud.com/v1/istoilis-istoilis/vagrant/oel64-64.box
24+
- name: oracle-6.4
25+
driver_config:
26+
box: oracle-6.4
27+
box_url: https://storage.us2.oraclecloud.com/v1/istoilis-istoilis/vagrant/oel64-64.box
2828
- name: oracle-6.5
2929
driver_config:
3030
box: oracle-6.5
@@ -37,6 +37,10 @@ platforms:
3737
driver_config:
3838
box: debian-7
3939
box_url: https://s3.eu-central-1.amazonaws.com/ffuenf-vagrantboxes/debian/debian-7.7.0-amd64_virtualbox.box
40+
- name: debian-8
41+
driver_config:
42+
box: debian-8
43+
box_url: https://s3.eu-central-1.amazonaws.com/ffuenf-vagrantboxes/debian/debian-8.0.0-amd64_virtualbox.box
4044
suites:
4145
- name: default
4246
manifest: site.pp

.travis.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,14 @@ rvm:
55
language: ruby
66
bundler_args: --without development integration openstack
77
env:
8+
- PUPPET_VERSION="~> 4.0.0"
9+
- PUPPET_VERSION="~> 3.7.5"
10+
- PUPPET_VERSION="~> 3.6.2"
811
- PUPPET_VERSION="~> 2.7.0"
9-
- PUPPET_VERSION="~> 3.0.0"
10-
- PUPPET_VERSION="~> 3.5.0"
11-
- PUPPET_VERSION="~> 3.6.0"
1212
matrix:
1313
fast_finish: true
1414
exclude:
1515
- rvm: 1.9.3
1616
env: PUPPET_VERSION="~> 2.7.0"
1717
- rvm: 2.0.0
1818
env: PUPPET_VERSION="~> 2.7.0"
19-
- rvm: 2.0.0
20-
env: PUPPET_VERSION="~> 3.0.0"

0 commit comments

Comments
 (0)