summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSeth Chisamore <schisamo@chef.io>2016-04-15 16:37:51 -0400
committerSeth Chisamore <schisamo@chef.io>2016-04-15 16:37:51 -0400
commitdab96dda517448fc973491fa26656fc12b319aae (patch)
tree02343ac7bcca2989c4ceaf2d35064538658a86dd
parentf99b3362694d9cd9f70aa808b96a3fe3420650e1 (diff)
parent27809e41cf648c78fc5c25ce84af02a83ccfd4ac (diff)
downloadchef-dab96dda517448fc973491fa26656fc12b319aae.tar.gz
Merge pull request #4835 from chef/schisamo/omnibus-build-lab-fixes
Omnibus Build Lab fixes/improvements
-rw-r--r--omnibus/.gitignore1
-rw-r--r--omnibus/.kitchen.yml41
2 files changed, 14 insertions, 28 deletions
diff --git a/omnibus/.gitignore b/omnibus/.gitignore
index 0425859582..1a2c556f8d 100644
--- a/omnibus/.gitignore
+++ b/omnibus/.gitignore
@@ -8,3 +8,4 @@ cookbooks
vendor/cookbooks
build_timestamp
ldd.out
+Berksfile.lock
diff --git a/omnibus/.kitchen.yml b/omnibus/.kitchen.yml
index fa3e8c85ce..6a56b92dcb 100644
--- a/omnibus/.kitchen.yml
+++ b/omnibus/.kitchen.yml
@@ -23,68 +23,53 @@ provisioner:
require_chef_omnibus: true
platforms:
- - name: centos-5.10
+ - name: centos-5.11
run_list: yum-epel::default
- - name: centos-6.5
+ - name: centos-6.7
run_list: yum-epel::default
- - name: centos-7.0
+ - name: centos-7.2
run_list: yum-epel::default
- - name: debian-7.2.0
+ - name: debian-6.0.8
run_list: apt::default
- - name: debian-7.4
+ - name: debian-7.9
run_list: apt::default
- - name: debian-6.0.8
+ - name: debian-8.2
run_list: apt::default
- - name: freebsd-9.2
+ - name: freebsd-9.3
run_list:
- freebsd::portsnap
- freebsd::pkgng
- - name: freebsd-10.0
+ - name: freebsd-10.2
run_list: freebsd::portsnap
- name: ubuntu-10.04
run_list: apt::default
- name: ubuntu-12.04
run_list: apt::default
- - name: ubuntu-12.10
- run_list: apt::default
- - name: ubuntu-13.04
- run_list: apt::default
- - name: ubuntu-13.10
- run_list: apt::default
- name: ubuntu-14.04
run_list: apt::default
# The following (private) boxes are shared via Atlas and are only
# available to users working for Chef. Sorry, it's about software licensing.
- #
- # Chef-internal users, you will need to:
+ #
+ # Chef-internal users, you will need to:
# 1. Create an Atlas account: https://atlas.hashicorp.com/
# 2. Ping the Release Services room with your Atlas account name
# to be added to the relevant team in Atlas,
# 3. Do `vagrant login` with your Atlas creds so that you can download
- # the private boxes.
+ # the private boxes.
#
# The Mac OS X boxes are VMware only also. You can enable VMware Fusion
# as the default provider by copying `.kitchen.local.yml.vmware.example`
# over to `.kitchen.local.yml`.
#
- - name: macosx-10.8
- driver:
- box: chef/macosx-10.8 # private
- name: macosx-10.9
driver:
box: chef/macosx-10.9 # private
- name: macosx-10.10
driver:
box: chef/macosx-10.10 # private
- - name: windows-7-professional
- driver:
- box: chef/windows-7-professional # private
- - name: windows-8.1-professional
- driver:
- box: chef/windows-8.1-professional # private
- - name: windows-2008r2-standard
+ - name: macosx-10.11
driver:
- box: chef/windows-server-2008r2-standard # private
+ box: chef/macosx-10.11 # private
- name: windows-2012r2-standard
driver:
box: chef/windows-server-2012r2-standard # private