summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Wright <patrick@getchef.com>2015-09-29 17:21:15 -0700
committerPatrick Wright <patrick@getchef.com>2015-09-29 17:21:15 -0700
commit4d537dd07a39a3159226e06c086cb608d0835eea (patch)
treeae6ceee12c001773404ee24207b1c80e12f81feb
parent346f53c339b83e1535399e00f21b13bb665e018f (diff)
downloadchef-4d537dd07a39a3159226e06c086cb608d0835eea.tar.gz
chef acceptance prep
-rw-r--r--acceptance/.acceptance.yml7
-rw-r--r--acceptance/.kitchen.yml13
2 files changed, 9 insertions, 11 deletions
diff --git a/acceptance/.acceptance.yml b/acceptance/.acceptance.yml
index 20c19819c5..ffe12e7ef6 100644
--- a/acceptance/.acceptance.yml
+++ b/acceptance/.acceptance.yml
@@ -1,5 +1,4 @@
---
-name: chef
-channel: current # default
-version: latest # default
-kitchen_config: .kitchen.yml # default
+project_name: chef
+channel: <%= ENV['CHANNEL'] || 'current' %>
+version: <%= ENV['PROJECT_VERSION'] || 'latest' %>
diff --git a/acceptance/.kitchen.yml b/acceptance/.kitchen.yml
index 1f73c2f30b..be3a1dde89 100644
--- a/acceptance/.kitchen.yml
+++ b/acceptance/.kitchen.yml
@@ -7,24 +7,23 @@ driver:
provisioner:
name: chef_zero
- chef_omnibus_url: https://omnitruck.chef.io/current/install.sh
data_path: test/fixtures
platforms:
# upstream community mysql cookbook broken on 10.04
#- name: ubuntu-10.04
# run_list: apt::default
- - name: ubuntu-12.04
- run_list: apt::default
+ # - name: ubuntu-12.04
+ # run_list: apt::default
- name: ubuntu-14.04
run_list: apt::default
# upstream community mysql cookbook also broken on 14.10
#- name: ubuntu-14.10
# run_list: apt::default
- - name: centos-6.4
- run_list: yum-epel::default
- - name: centos-5.10
- run_list: yum-epel::default
+ # - name: centos-6.4
+ # run_list: yum-epel::default
+ # - name: centos-5.10
+ # run_list: yum-epel::default
suites:
- name: webapp