Skip to content

Commit

Permalink
converting to custom resources
Browse files Browse the repository at this point in the history
- converting from LWRP to custom resources
- removing yum-mysql and other dependencies
- more thoughtful ChefSpec
- renaming "replication" test suite to "smoke"
- moving to Inspec
  • Loading branch information
someara committed Jul 7, 2016
1 parent 1e4d26d commit 824e854
Show file tree
Hide file tree
Showing 167 changed files with 2,455 additions and 17,728 deletions.
317 changes: 212 additions & 105 deletions .kitchen.docker.yml → .kitchen.dokken.yml

Large diffs are not rendered by default.

408 changes: 235 additions & 173 deletions .kitchen.yml

Large diffs are not rendered by default.

33 changes: 17 additions & 16 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,33 +20,34 @@ services: docker

env:
matrix:
- INSTANCE=service55-multi-centos-6
- INSTANCE=service55-multi-centos-7
- INSTANCE=service55-multi-ubuntu-1204
- INSTANCE=service55-multi-ubuntu-1404
- INSTANCE=service56-multi-centos-6
- INSTANCE=service56-multi-centos-7
- INSTANCE=service56-multi-fedora-latest
- INSTANCE=service56-multi-ubuntu-1404
- INSTANCE=service56-multi-opensuse-132
- INSTANCE=service56-multi-opensuse-421
- INSTANCE=service57-multi-centos-6
- INSTANCE=service57-multi-centos-7
- INSTANCE=service57-multi-fedora-latest
- INSTANCE=service57-multi-ubuntu-1604
- INSTANCE=smoke-centos-6
- INSTANCE=smoke-centos-7
- INSTANCE=smoke-fedora-latest
- INSTANCE=smoke-debian-7
- INSTANCE=smoke-debian-8
- INSTANCE=smoke-ubuntu-1204
- INSTANCE=smoke-ubuntu-1404
- INSTANCE=smoke-ubuntu-1604
- INSTANCE=smoke-opensuse-132
- INSTANCE=smoke-opensuse-421

# Ensure we make ChefDK's Ruby the default
before_script:
# https://github.com/zuazo/kitchen-in-travis-native/issues/1#issuecomment-142230889
# https://github.com/zuazo/kitchen-in-travis-native/issues/1#issuecomment-142230889
- sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
- eval "$(/opt/chefdk/bin/chef shell-init bash)"
- /opt/chefdk/embedded/bin/chef gem install kitchen-dokken
- /opt/chefdk/embedded/bin/chef --version
- /opt/chefdk/embedded/bin/cookstyle --version
- /opt/chefdk/embedded/bin/foodcritic --version

script: KITCHEN_LOCAL_YAML=.kitchen.docker.yml /opt/chefdk/embedded/bin/kitchen verify ${INSTANCE}
script: KITCHEN_LOCAL_YAML=.kitchen.dokken.yml kitchen verify ${INSTANCE}

after_script:
- docker images
- docker ps -a
- cat .kitchen/logs/kitchen.log

matrix:
include:
- script: /opt/chefdk/embedded/bin/cookstyle
Expand Down
9 changes: 1 addition & 8 deletions Berksfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,6 @@ source 'https://supermarket.chef.io'
metadata

group :integration do
cookbook 'yum'
cookbook 'apt'
cookbook 'freebsd'
cookbook 'ips-omniti'
cookbook 'selinux'
cookbook 'mysql_client_test', path: 'test/fixtures/cookbooks/mysql_client_test'
cookbook 'mysql_config_test', path: 'test/fixtures/cookbooks/mysql_config_test'
cookbook 'mysql_replication_test', path: 'test/fixtures/cookbooks/mysql_replication_test'
cookbook 'mysql_service_test', path: 'test/fixtures/cookbooks/mysql_service_test'
cookbook 'mysql_test', path: 'test/cookbooks/mysql_test'
end
Loading

1 comment on commit 824e854

@salsa-dev
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This commit introduced default version for ubuntu trusty which happens to not exist in the repo.
return '5.5.49-0ubuntu0.14.04.1' if major_version == '5.5' && trusty?
That is why cookbook fails.

Please sign in to comment.