summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormo khan <mo@mokhan.ca>2015-10-04 18:35:41 -0600
committermo khan <mo@mokhan.ca>2015-10-04 18:35:41 -0600
commit3116d9bd29074fe3570705b6f783e6b3c24ec0c8 (patch)
treeb4679bdaece6529dafcf1b9487d58732ca68e20a
parent66bbdbb4a07cf4efe4230c3084f51349e70775eb (diff)
include ubuntu 14.04 in test kitchen ci run.
-rw-r--r--.kitchen.ci.yml3
-rw-r--r--.travis.yml3
2 files changed, 5 insertions, 1 deletions
diff --git a/.kitchen.ci.yml b/.kitchen.ci.yml
index 501665b..8751fdc 100644
--- a/.kitchen.ci.yml
+++ b/.kitchen.ci.yml
@@ -9,6 +9,9 @@ driver:
platforms:
- name: centos-6.4
+ - name: ubuntu-14.04
+ driver:
+ image_id: ami-d85e75b0
transport:
ssh_key: <%= ENV['EC2_SSH_KEY_PATH'] %>
diff --git a/.travis.yml b/.travis.yml
index 83997c0..7cf5c3d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,8 @@ rvm:
- 2.2.3
env:
- TEST_SUITE=rspec
-- TEST_SUITE='rake kitchen:all'
+- TEST_SUITE='rake kitchen:default-centos-64'
+- TEST_SUITE='rake kitchen:default-ubuntu-1404'
before_install:
- openssl aes-256-cbc -K $encrypted_fc652662b082_key -iv $encrypted_fc652662b082_iv -in travis-ci.pem.enc -out travis-ci.pem -d
before_script: