Commit 0f1c884a authored by Tim Smith's avatar Tim Smith

License acceptance updates

Signed-off-by: default avatarTim Smith <tsmith@chef.io>
parent ca0fda11
......@@ -7,9 +7,6 @@ addons:
install: echo "skip bundle install"
env:
- CHEF_LICENSE=accept
branches:
only:
- master
......@@ -18,21 +15,23 @@ services: docker
env:
matrix:
- INSTANCE=default-centos-6
- INSTANCE=default-centos-7
- INSTANCE=dnf-compat-fedora-latest
- INSTANCE=default-amazonlinux
- INSTANCE=default-amazonlinux-2
- INSTANCE=default-centos-6
- INSTANCE=default-centos-7
- INSTANCE=default-centos-8
before_script:
- sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
- eval "$(chef shell-init bash)"
- chef --version
script: KITCHEN_LOCAL_YAML=kitchen.dokken.yml kitchen verify ${INSTANCE}
script: KITCHEN_LOCAL_YAML=kitchen.dokken.yml CHEF_VERSION=${CHEF_VERSION} kitchen verify ${INSTANCE}
matrix:
include:
- script:
- chef exec delivery local all
env:
- UNIT_AND_LINT=1
- CHEF_LICENSE=accept
- UNIT_AND_LINT=1
......@@ -45,22 +45,19 @@ a.out
# Testing #
###########
.watchr
.rspec
spec/*
spec/fixtures/*
test/*
features/*
examples/*
Guardfile
Procfile
.kitchen*
.rubocop.yml
spec/*
Rakefile
.travis.yml
.foodcritic
.codeclimate.yml
appveyor.yml
# SCM #
#######
......@@ -82,20 +79,14 @@ Berksfile.lock
cookbooks/*
tmp
# Policyfile #
##############
Policyfile.rb
Policyfile.lock.json
# Cookbooks #
#############
CONTRIBUTING*
CHANGELOG*
TESTING*
# Strainer #
############
Colanderfile
Strainerfile
.colander
.strainer
# Vagrant #
###########
.vagrant
Vagrantfile
driver:
name: dokken
chef_version: 12.14.89
privileged: true # because Docker and SystemD/Upstart
chef_version: <%= ENV['CHEF_VERSION'] || 'current' %>
transport:
name: dokken
......@@ -9,31 +9,37 @@ transport:
provisioner:
name: dokken
deprecations_as_errors: true
chef_license: accept-no-persist
verifier:
name: inspec
platforms:
- name: amazonlinux
driver:
image: dokken/amazonlinux
pid_one_command: /sbin/init
- name: amazonlinux-2
driver:
image: dokken/amazonlinux-2
pid_one_command: /usr/lib/systemd/systemd
- name: centos-6
driver:
image: centos:6
image: dokken/centos-6
pid_one_command: /sbin/init
- name: centos-7
driver:
image: centos:7
image: dokken/centos-7
pid_one_command: /usr/lib/systemd/systemd
- name: centos-8
driver:
image: dokken/centos-8
pid_one_command: /usr/lib/systemd/systemd
- name: fedora-latest
driver:
image: fedora:latest
suites:
- name: default
run_list:
- recipe[yum::default]
- recipe[yum_test::test_globalconfig_two]
excludes: fedora-latest
- name: dnf_compat
run_list:
- recipe[yum::dnf_yum_compat]
- recipe[yum_test::test_dnf_compat]
includes: fedora-latest
image: fedora:latest
\ No newline at end of file
......@@ -4,13 +4,19 @@ driver:
provisioner:
name: chef_zero
deprecations_as_errors: true
chef_license: accept-no-persist
verifier:
name: inspec
platforms:
- name: amazonlinux
driver_config:
box: mvbcoding/awslinux
- name: amazonlinux-2
- name: centos-6
- name: centos-7
- name: centos-8
- name: fedora-29
suites:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment