summaryrefslogtreecommitdiff
path: root/acceptance
diff options
context:
space:
mode:
authorSerdar Sutay <serdar@opscode.com>2016-01-12 12:30:51 -0800
committerSerdar Sutay <serdar@opscode.com>2016-01-27 23:04:16 -0800
commit135d0c3f54d38a648647e289f8303c6316f44099 (patch)
tree6bcf5c12af949ea368ffede59ba84ab8df66cfe3 /acceptance
parentf0a0b3cdd1674dbf138e71fd1fb64939bad057df (diff)
downloadchef-135d0c3f54d38a648647e289f8303c6316f44099.tar.gz
Make sure acceptance tests for chef can run in Jenkins.sersut/ec2-acceptance
Diffstat (limited to 'acceptance')
-rw-r--r--acceptance/.gitignore1
-rw-r--r--acceptance/cookbook-git/.kitchen.ec2.yml2
2 files changed, 2 insertions, 1 deletions
diff --git a/acceptance/.gitignore b/acceptance/.gitignore
new file mode 100644
index 0000000000..66f8ed35a4
--- /dev/null
+++ b/acceptance/.gitignore
@@ -0,0 +1 @@
+/Gemfile.lock
diff --git a/acceptance/cookbook-git/.kitchen.ec2.yml b/acceptance/cookbook-git/.kitchen.ec2.yml
index e140d9ea8a..ba323aa65f 100644
--- a/acceptance/cookbook-git/.kitchen.ec2.yml
+++ b/acceptance/cookbook-git/.kitchen.ec2.yml
@@ -301,4 +301,4 @@ provisioner:
name: chef_zero
product_name: chef
product_version: latest
- channel: current
+ channel: unstable