summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKartik Null Cating-Subramanian <ksubramanian@chef.io>2016-01-13 12:02:24 -0500
committerKartik Null Cating-Subramanian <ksubramanian@chef.io>2016-01-27 16:59:21 -0500
commit24d013550c1b9e8b21dd1136b080c716f231b2ac (patch)
tree35598002cc06d71f16fb2024ed8b114f33a51179
parentf3cefaf6b84bf0771f31418f497cc903d80a62db (diff)
downloadchef-24d013550c1b9e8b21dd1136b080c716f231b2ac.tar.gz
Add win2012r2 to kitchen.yml and update .gitignore.
-rw-r--r--.gitignore2
-rw-r--r--omnibus/.gitignore1
-rw-r--r--omnibus/.kitchen.yml3
3 files changed, 4 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index 064d998d6e..044899b03d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,4 +49,4 @@ kitchen-tests/nodes/*
# Temporary files present during spec runs
spec/data/test-dir
-config/
+/config/
diff --git a/omnibus/.gitignore b/omnibus/.gitignore
index d97af2ef9c..0425859582 100644
--- a/omnibus/.gitignore
+++ b/omnibus/.gitignore
@@ -8,4 +8,3 @@ cookbooks
vendor/cookbooks
build_timestamp
ldd.out
-jenkins/chef-solo
diff --git a/omnibus/.kitchen.yml b/omnibus/.kitchen.yml
index 844ae9d895..7ca0af7f25 100644
--- a/omnibus/.kitchen.yml
+++ b/omnibus/.kitchen.yml
@@ -85,6 +85,9 @@ platforms:
- name: windows-2008r2-standard
driver:
box: chef/windows-server-2008r2-standard # private
+ - name: windows-2012r2-standard
+ driver:
+ box: chef/windows-server-2012r2-standard # private
attribute_defaults: &attribute_defaults
build_user: vagrant