Merge pull request #337 from johnbellone/integration-docker

Add travis and docker integration tests.

.kitchen.dokken.yml

@@ -10,33 +10,86 @@ transport:
 provisioner:
   name: dokken
 
+verifier:
+  root_path: /opt/verifier
+
 platforms:
   - name: centos-7
-    named_run_list: rhel
+    named_run_list: centos
     driver:
       image: centos:7
       platform: rhel
       pid_one_command: /usr/lib/systemd/systemd
       intermediate_instructions:
-        - RUN yum clean all
-        - RUN yum -y install net-tools lsof
+        - RUN yum -y install lsof which systemd-sysv initscripts sudo
+    attributes:
+      poise-service:
+        consul:
+          provider: systemd
   - name: centos-6
-    named_run_list: rhel
+    named_run_list: centos
     driver:
       image: centos:6
       platform: rhel
       pid_one_command: /sbin/init
       intermediate_instructions:
-        - RUN yum -y install which initscripts
+        - RUN yum -y install which initscripts sudo
   - name: ubuntu-16.04
     named_run_list: debian
     driver:
       image: ubuntu:16.04
+      pid_one_command: /bin/systemd
+      intermediate_instructions:
+        - RUN /usr/bin/apt-get update -y
+        - RUN /usr/bin/apt-get install sudo net-tools -y
+    attributes:
+      poise-service:
+        consul:
+          provider: systemd
+  - name: ubuntu-14.04
+    named_run_list: debian
+    driver:
+      image: ubuntu-upstart:14.04
+      pid_one_command: /sbin/init
+      intermediate_instructions:
+        - RUN /usr/bin/apt-get update -y
+        - RUN /usr/bin/apt-get install sudo net-tools -y
+    attributes:
+      poise-service:
+        consul:
+          provider: upstart
+  - name: ubuntu-12.04
+    named_run_list: debian
+    driver:
+      image: ubuntu-upstart:12.04
       pid_one_command: /sbin/init
+      intermediate_instructions:
+        - RUN /usr/bin/apt-get update -y
+        - RUN /usr/bin/apt-get install sudo net-tools -y
+    attributes:
+      poise-service:
+        consul:
+          provider: upstart
+  - name: debian-8
+    named_run_list: debian
+    driver:
+      image: debian:8
+      pid_one_command: /bin/systemd
       intermediate_instructions:
         - RUN /usr/bin/apt-get update
-        - RUN /usr/bin/apt-get install apt-transport-https net-tools -y
-
+        - RUN /usr/bin/apt-get install lsb-release sudo net-tools -y
+    attributes:
+      poise-service:
+        consul:
+          provider: systemd
+  - name: debian-7
+    named_run_list: debian
+    driver:
+      image: debian:7
+      pid_one_command: /sbin/init
+      intermediate_instructions:
+        - RUN /usr/bin/apt-get update
+        - RUN /usr/bin/apt-get install lsb-release sudo net-tools -y
 suites:
   - name: default
     provisioner:

.kitchen.yml

@@ -13,11 +13,11 @@ platforms:
   - name: ubuntu-12.04
     named_run_list: debian
   - name: centos-7.2
-    named_run_list: rhel
+    named_run_list: centos
   - name: centos-6.7
-    named_run_list: rhel
+    named_run_list: centos
   - name: centos-5.11
-    named_run_list: rhel
+    named_run_list: centos
   - name: debian-8.2
     named_run_list: debian
   - name: debian-7.9

.rspec

@@ -1,2 +1 @@
---color
---default-path test/spec
+--default-path test/spec --color

.rubocop.yml

@@ -1,12 +1,10 @@
 ---
 AllCops:
   Exclude:
-    - 'Guardfile'
     - 'Rakefile'
     - 'Vagrantfile'
     - 'Policyfile.rb'
     - 'Berksfile'
-    - 'Thorfile'
     - 'Gemfile'
     - 'metadata.rb'
     - 'test/**/*'
@@ -44,3 +42,7 @@ Style/PercentLiteralDelimiters:
   Enabled: false
 Style/ModuleFunction:
   Enabled: false
+Style/AlignHash:
+  Enabled: false
+Style/SpaceInsideHashLiteralBraces:
+  Enabled: false

.travis.yml

@@ -1,14 +1,47 @@
 ---
-language: ruby
+sudo: required
+dist: trusty
+language: generic
 cache: bundler
-sudo: false
+addons:
+  apt:
+    sources:
+      - chef-current-trusty
+    packages:
+      - chefdk
+services: docker
+env:
+  matrix:
+    - INSTANCE=default-centos-7
+    - INSTANCE=default-centos-6
+    - INSTANCE=default-ubuntu-1604
+    - INSTANCE=default-ubuntu-1404
+    - INSTANCE=default-ubuntu-1204
+    - INSTANCE=default-debian-8
+    - INSTANCE=default-debian-7
+before_script:
+  # 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 gem install kitchen-verifier-serverspec
+  - /opt/chefdk/embedded/bin/chef --version
+  - /opt/chefdk/embedded/bin/cookstyle --version
+  - /opt/chefdk/embedded/bin/foodcritic --version
+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
+    env:  COOKSTYLE=1
+  - script: /opt/chefdk/embedded/bin/foodcritic . --exclude spec -f any
+    env:  FOODCRITIC=1
+  - script:
+      - bundle install
+      - /opt/chefdk/embedded/bin/rspec --color --default-path test/spec
+    env:  CHEFSPEC=1
 notifications:
   slack: bloomberg-rnd:BvYmxrV9xj902XWTRNrkLNkR
-script: bundle exec rake travis
-rvm:
-  - 2.2
-branches:
-  only:
-    - master
-matrix:
-  fast_finish: true

Gemfile

@@ -13,6 +13,7 @@ end
 group :unit, :integration do
   gem 'chef-dk'
   gem 'chefspec'
+  gem 'rubyzip'
   gem 'serverspec'
 end
 

libraries/helpers.rb

@@ -6,7 +6,7 @@
 #
 
 module ConsulCookbook
-  module Helpers # rubocop:disable Metrics/ModuleLength
+  module Helpers
     include Chef::Mixin::ShellOut
 
     extend self

metadata.rb

@@ -23,7 +23,7 @@
 depends 'golang'
 depends 'firewall', '~> 2.0'
 depends 'poise', '~> 2.2'
-depends 'poise-service', '~> 1.0'
+depends 'poise-service', '~> 1.4'
 depends 'rubyzip', '~> 1.3'
 depends 'yum-epel'
 

test/fixtures/policies/_base.rb

@@ -1,8 +1,8 @@
 default_source :community
 default_source :chef_repo, '..'
 cookbook 'consul', path: '../../..'
-run_list 'consul::default', "consul_spec::#{name}"
-named_run_list :rhel, 'yum::default', run_list
+run_list 'sudo::default', 'consul::default', "consul_spec::#{name}"
+named_run_list :centos, 'yum::default', 'yum-centos::default', run_list
 named_run_list :debian, 'apt::default', run_list
 named_run_list :freebsd, 'freebsd::default', run_list
 named_run_list :windows, 'windows::default', run_list

test/integration/default/serverspec/default_spec.rb

@@ -78,18 +78,6 @@
   it { should be_mode 750 }
 end
 
-if os[:family] == 'ubuntu'
-  describe file('/etc/init/consul.conf' ) do
-    its(:content) do
-      should include(<<-EOT)
-post-start script
-  while ! #{consul_executable} info ; sleep 1; done
-end script
-      EOT
-    end
-  end
-end
-
 describe file("#{confd_dir}/consul_definition_check.json") do
   it { should be_file }
   it { should be_owned_by     'root' }

test/spec/libraries/consul_installation_webui_spec.rb

@@ -8,6 +8,8 @@
   let(:chefspec_options) { {platform: 'ubuntu', version: '14.04'} }
 
   context 'webui installation' do
+    pending('replace with poise-archive')
+
     recipe do
       consul_installation '0.6.4' do
         provider :webui