Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Maintainer and testing updates #60

Merged
merged 6 commits into from Aug 15, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
49 changes: 21 additions & 28 deletions .kitchen.dokken.yml
@@ -1,7 +1,7 @@
driver:
name: dokken
privileged: true # because Docker and SystemD/Upstart
chef_version: current
chef_version: <%= ENV['CHEF_VERSION'] || 'current' %>

transport:
name: dokken
Expand All @@ -14,69 +14,62 @@ verifier:
name: inspec

platforms:
- name: amazonlinux
driver:
image: dokken/amazonlinux
pid_one_command: /sbin/init

- name: debian-7
driver:
image: debian:7
image: dokken/debian-7
pid_one_command: /sbin/init
intermediate_instructions:
- RUN /usr/bin/apt-get update
- RUN /usr/bin/apt-get install apt-transport-https lsb-release procps net-tools -y

- name: debian-8
driver:
image: debian:8
image: dokken/debian-8
pid_one_command: /bin/systemd
intermediate_instructions:
- RUN /usr/bin/apt-get update

- name: debian-9
driver:
image: dokken/debian-9
pid_one_command: /bin/systemd
intermediate_instructions:
- RUN /usr/bin/apt-get update
- RUN /usr/bin/apt-get install apt-transport-https lsb-release procps net-tools -y

- name: centos-6
driver:
image: centos:6
platform: rhel
image: dokken/centos-6
pid_one_command: /sbin/init
intermediate_instructions:
- RUN yum -y install lsof which initscripts net-tools wget net-tools

- name: centos-7
driver:
image: centos:7
platform: rhel
image: dokken/centos-7
pid_one_command: /usr/lib/systemd/systemd
intermediate_instructions:
- RUN yum -y install lsof which systemd-sysv initscripts wget net-tools

- name: fedora-latest
driver:
image: fedora:latest
image: dokken/fedora-latest
pid_one_command: /usr/lib/systemd/systemd
intermediate_instructions:
- RUN dnf -y install which systemd-sysv initscripts wget net-tools

- name: ubuntu-14.04
driver:
image: ubuntu-upstart:14.04
image: dokken/ubuntu-14.04
pid_one_command: /sbin/init
intermediate_instructions:
- RUN /usr/bin/apt-get update
- RUN /usr/bin/apt-get install apt-transport-https lsb-release procps net-tools -y

- name: ubuntu-16.04
driver:
image: ubuntu:16.04
image: dokken/ubuntu-16.04
pid_one_command: /bin/systemd
intermediate_instructions:
- RUN /usr/bin/apt-get update
- RUN /usr/bin/apt-get install apt-transport-https lsb-release procps net-tools -y

- name: opensuse-leap
driver:
image: opensuse:leap
image: dokken/opensuse-leap
pid_one_command: /bin/systemd
intermediate_instructions:
- RUN zypper --non-interactive install aaa_base perl-Getopt-Long-Descriptive which net-tools

suites:
- name: default
run_list:
- recipe[test::default]
5 changes: 3 additions & 2 deletions .kitchen.yml
Expand Up @@ -6,10 +6,11 @@ provisioner:
deprecations_as_errors: true

platforms:
- name: centos-6.8
- name: centos-6.9
- name: centos-7.3
- name: debian-7.11
- name: debian-8.7
- name: debian-8.8
- name: debian-9.0
- name: fedora-25
- name: opensuse-leap-42.2
- name: ubuntu-14.04
Expand Down
12 changes: 6 additions & 6 deletions .travis.yml
Expand Up @@ -26,15 +26,15 @@ env:

before_script:
- 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 --version
- /opt/chefdk/embedded/bin/cookstyle --version
- /opt/chefdk/embedded/bin/foodcritic --version
- eval "$(chef shell-init bash)"
- chef --version
- cookstyle --version
- foodcritic --version

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

matrix:
include:
- script:
- /opt/chefdk/bin/chef exec delivery local all
- chef exec delivery local all
env: UNIT_AND_LINT=1
16 changes: 0 additions & 16 deletions MAINTAINERS.md

This file was deleted.

43 changes: 0 additions & 43 deletions MAINTAINERS.toml

This file was deleted.

6 changes: 4 additions & 2 deletions README.md
Expand Up @@ -514,9 +514,11 @@ misc_timeout | Integer | nil
warmup | Integer | nil
misc_dynamic | TrueClass, FalseClass | nil

## License & Authors
## Maintainers

**Author:** Cookbook Engineering Team ([cookbooks@chef.io](mailto:cookbooks@chef.io))
This cookbook is maintained by Chef's Community Cookbook Engineering team. Our goal is to improve cookbook quality and to aid the community in contributing to cookbooks. To learn more about our team, process, and design goals see our [team documentation](https://github.com/chef-cookbooks/community_cookbook_documentation/blob/master/COOKBOOK_TEAM.MD). To learn more about contributing to cookbooks like this see our [contributing documentation](https://github.com/chef-cookbooks/community_cookbook_documentation/blob/master/CONTRIBUTING.MD), or if you have general questions about this cookbook come chat with us in #cookbok-engineering on the [Chef Community Slack](http://community-slack.chef.io/)

## License

**Copyright:** 2009-2016, Chef Software, Inc.

Expand Down
5 changes: 5 additions & 0 deletions chefignore
Expand Up @@ -82,6 +82,11 @@ Berksfile.lock
cookbooks/*
tmp

# Policyfile #
##############
Policyfile.rb
Policyfile.lock.json

# Cookbooks #
#############
CONTRIBUTING*
Expand Down
76 changes: 0 additions & 76 deletions tasks/maintainers.rb

This file was deleted.