Skip to content

Commit

Permalink
Merge pull request #19 from thmttch/0.6.0-lots-of-changes
Browse files Browse the repository at this point in the history
numerous changes for next major release:
  • Loading branch information
thmttch committed Oct 2, 2015
2 parents 57dd98e + 9653bf8 commit 04ec108
Show file tree
Hide file tree
Showing 20 changed files with 389 additions and 259 deletions.
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ bin/*
.kitchen/
.kitchen.local.yml

# anaconda installs should not be checked in
Anaconda-*-Linux-*.sh
# local anaconda installers should not be checked in
Anaconda*-*-Linux-*.sh

# OSX
.DS_Store
28 changes: 20 additions & 8 deletions .kitchen.yml
Original file line number Diff line number Diff line change
@@ -1,22 +1,34 @@
---
driver:
name: vagrant
# you can restore this if you want, but it'll be slooooooow
#name: vagrant
name: docker
driver_config:
binary: /usr/local/bin/docker
# install latest if not present
require_chef_omnibus: true

provisioner:
# it would be nice if this supported multiple provisioners (ordered) like vagrant does...
#name: shell
name: chef_solo

platforms:
# ubuntu: 2 LTS, and the latest
- name: ubuntu-12.04
# - name: ubuntu-12.10
# driver:
# box: chef/ubuntu-11.10
# - name: ubuntu-13.04
# driver:
# box: chef/ubuntu-13.04
- name: ubuntu-13.10
- name: ubuntu-14.04
- name: ubuntu-15.04
# debian: stable, oldstable
# TODO 7.9 and 8.2 were recently released
- name: debian-7.8
- name: debian-8.1
# centos
- name: centos-5.11
# TODO 6.7 is the latest
- name: centos-6.6
- name: centos-7.1.1503
# redhat: 5.9, 6.6, 7.1
# TODO what's the platform name in docker?

suites:
- name: default
Expand Down
2 changes: 2 additions & 0 deletions .rspec
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
--color
--format documentation
1 change: 0 additions & 1 deletion .ruby-gemset

This file was deleted.

1 change: 0 additions & 1 deletion .ruby-version

This file was deleted.

2 changes: 1 addition & 1 deletion Berksfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source "http://api.berkshelf.com"
source "https://supermarket.chef.io"

metadata
44 changes: 44 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,49 @@
# CHANGELOG

## 0.6.0

**This is a backwards-INCOMPATIBLE release**

API, cookbook changes:

- Refactored attributes to be cleaner and more readable
- The user and group are now created if they don't exist, and by default are
installed under anaconda/anaconda
- New attributes for configuring notebook server
- The OS architecture (x86 versus x86_64) is now autodetected by default

Platform, support changes:

- Added support for Anaconda 2.3 (all pythons and all architectures)
- Removed support for all Anacondas < 2.2.0
- updated metadata.rb 'supports' tags (hopefully this doesn't break anything)

Tools changes:

- Migrated to chefdk 0.8.1
- upgraded gems
- updated chefspec
- updated documentation
- removed rbenv/rvm files

Testing changes:

- Moved to kitchen-docker for Docker-based testing, which is much much much
faster
- Updated supported (tested) platforms:
- ubuntu:
- removed: 12.10, 13.04, 13.10
- added: 15.04
- debian:
- removed: 6.0.5
- added: 7.8, 8.1 (7.9 and 8.2 not in fauxhai yet)
- centos:
- removed: 5.8, 6.0, 6.3
- added: 5.11, 6.6, 7.1.1503
- redhat (chefspec only, no kitchen testing):
- removed: 5.8, 6.3
- added: 5.9, 6.6, 7.1.1503

## 0.5.1

- Added support for Anaconda 2.2.0 with Python 3
Expand Down
5 changes: 4 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@ source 'https://rubygems.org'
gem 'berkshelf'
gem 'chefspec'

gem 'kitchen-vagrant'
gem 'test-kitchen'
# removed in favor of kitchen-docker
#gem 'kitchen-vagrant'
gem 'kitchen-docker'

gem 'foodcritic'

Expand Down
Loading

0 comments on commit 04ec108

Please sign in to comment.