kitchen-ansible 0.0.27 → 0.0.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c4491f1745701a0e990b9cacc7a48ce49556e36
-  data.tar.gz: 5ecaaef24e5c27f0ac0de4d4a3b0ed3d50ef7bc9
+  metadata.gz: 223abb6eceecdfa8a197428c4039c950c0e99ad8
+  data.tar.gz: 987c669a9bff598a0cec647eb08d81fe99042282
 SHA512:
-  metadata.gz: 3a6667c7da102e8e66a9dda3ea1e3a7969c4e2f6060baf26af177c590d39901fb121dd00ded1f34be3033953b71457310fa7e694805be245eb860adfbdaef274
-  data.tar.gz: 9aa38376c4e48222cea3bd304771b301ae9e99414a141dedf8782ec6ed415b67c5a61e660c7a1c98fc8911ebe391b67deaac336e210abfa63a5f37be9aae3afd
+  metadata.gz: c5ce4e7d6dbcecbe5c5e144fcf8b0b53c79aacdddc0565b3817d6c6374651240046531b207dade245debef173fc7b21ae1395672d3af54010bfe40d8c188626e
+  data.tar.gz: 3ee1cb4eef68554143bd32d5078f613f8f87fefddf829103d595db6e2bf302b93ca1bf4c9e4b2ea67661df8902dfef62ef35ba6b01b00052d7cb60ebd8f57206

data/README.md

@@ -48,25 +48,35 @@ platforms:
       network:
       - ['forwarded_port', {guest: 8080, host: 8080}]
       - [ 'private_network', { ip: '192.168.33.11' } ]
-      
+
 verifier:
-  ruby_bindir: '/usr/bin'      
+  ruby_bindir: '/usr/bin'
 ```
 **NOTE:** With Test-Kitchen 1.4 you no longer need chef install to run the tests. You just need ruby installed version 1.9 or higher and also add to the `.kitchen.yml` file
 
 ```yaml
-  verifier:
-    ruby_bindir: '/usr/bin'
+provisioner:
+  name: ansible_playbook
+  hosts: test-kitchen
+  require_chef_for_busser: false
+  require_ruby_for_busser: true
+
+verifier:
+  ruby_bindir: '/usr/bin'
 ```
-where `/usr/bin` is the location of the ruby command. 
+where `/usr/bin` is the location of the ruby command.
+
 
+## Test-Kitchen Serverspec
 
-## Test-Kitchen/Ansible/Serverspec
+To run the verify step with the test-kitchen serverspec setup your ansible repository as follows:
+
+NOTE: See https://github.com/delphix/ansible-package-caching-proxy for an example.
 
 In the root directory for your Ansible role:
 
 Create a `.kitchen.yml`, much like one the described above:
-    
+
 ```yaml
   ---
   driver:
@@ -89,14 +99,14 @@ Create a `.kitchen.yml`, much like one the described above:
          box: chef/centos-7.0
 
   verifier:
-    ruby_bindir: '/usr/bin'    
+    ruby_bindir: '/usr/bin'
 
   suites:
     - name: default
 ```
 
 Then for serverspec:
-    
+
 ```bash
   mkdir -p test/integration/default/serverspec/localhost
   echo "require 'serverspec'" >> test/integration/default/serverspec/spec_helper.rb
@@ -104,7 +114,7 @@ Then for serverspec:
 ```
 
 Create a basic playbook `test/integration/default.yml` so that kitchen can use your role (this should include any dependencies for your role):
-    
+
 ```yaml
   ---
   - name: wrapper playbook for kitchen testing "my_role"
@@ -114,7 +124,7 @@ Create a basic playbook `test/integration/default.yml` so that kitchen can use y
 ```
 
 Create your serverspec tests in `test/integration/default/serverspec/localhost/my_roles_spec.rb`:
-    
+
 ```ruby
   require 'spec_helper'
 
@@ -135,7 +145,64 @@ Create your serverspec tests in `test/integration/default/serverspec/localhost/m
   end
 ```
 
-### Testing multiple playbooks
+## Test-Kitchen Ansiblespec
+
+test-kitchen normally uses tests setup in `test/integration/....` directory. Ansiblespec format puts the tests with the
+roles in the ansible repository and the spec helper is specified in the ansible repository under the spec directory.
+
+To implement this with test-kitchen setup the ansible repository with:
+
+* the spec files with the roles.
+
+* the spec_helper in the spec folder.
+
+* a dummy `test/integration/<suite>/ansiblespec/localhost/<suite>_spec.rb` containing just a dummy comment.
+
+See example [https://github.com/neillturner/ansible_repo](https://github.com/neillturner/ansible_repo)
+
+```
+.
++-- roles
+��� +-- mariadb
+��� ��� +-- spec
+��� ��� ��� +-- mariadb_spec.rb
+��� ��� +-- tasks
+��� ��� ��� +-- main.yml
+��� ��� +-- templates
+��� ���     +-- mariadb.repo
+��� +-- nginx
+���     +-- handlers
+���     ��� +-- main.yml
+���     +-- spec
+���     ��� +-- nginx_spec.rb
+���     +-- tasks
+���     ��� +-- main.yml
+���     +-- templates
+���     ��� +-- nginx.repo
+���     +-- vars
+���         +-- main.yml
++-- spec
+    +-- spec_helper.rb
++-- test
+    +-- integration
+        +-- default      # name of test-kitchen suite
+            +-- ansiblespec
+                +-- localhost
+                    +-- default_spec.rb   # <suite>_spec.rb
+```
+
+In the root directory for your Ansible role create a `.kitchen.yml`, the same as for test-kitchen serverspec above.
+
+When test-kitchen runs the verify step will
+* detect the dummy `/test/integration/<suite>/ansiblespec` directory
+* install the busser-ansiblespec plugin instead of the normal busser-serverspec plugin
+* serverspec will be called using the ansiblespec conventions.
+* tests will run against all the roles in the playbook.
+
+See [busser-ansiblespec](https://github.com/neillturner/busser-ansiblespec)
+
+
+## Testing multiple playbooks
 To test different playbooks in different suites you can easily overwrite the provisioner settings in each suite seperately.
 ```yaml
 ---
@@ -163,7 +230,7 @@ To test different playbooks in different suites you can easily overwrite the pro
         playbook: web_app.yml
         hosts: web_application
 ```
-### Alternative Virtualization/Cloud providers for Vagrant
+## Alternative Virtualization/Cloud providers for Vagrant
 This could be adapted to use alternative virtualization/cloud providers such as Openstack/AWS/VMware Fusion according to whatever is supported by Vagrant.
 ```yaml
 platforms:
@@ -192,30 +259,20 @@ platforms:
 [packer]: https://packer.io
 [bento]: https://github.com/chef/bento
 
-## Custom ServerSpec or AnsibleSpec Invocation 
 
- Instead of using the busser use a custom serverspec invocation using [shell verifier](https://github.com/higanworks/kitchen-verifier-shell) to call it. 
-With such setup there is no dependency on busser and any other chef library.
+## Tips
 
-Also you can specify you tests in a different directory structure or even call [ansible spec](https://github.com/volanja/ansible_spec) instead of server spec and have tests in ansible_spec structure 
+You can easily skip previous instructions and jump directly to the broken statement you just fixed by passing
+an environment variable. Add folloing to your .kitchen.yml
 
-Using a structure like
 ```yaml
-verifier:                                                                       
-  name: shell                                                                   
-  remote_exec: true                                                             
-  command: |                                                                    
-    sudo -s <<SERVERSPEC                                                        
-    cd /opt/gdc/serverspec-core                                                 
-    export SERVERSPEC_ENV=$EC2DATA_ENVIRONMENT                                  
-    export SERVERSPEC_BACKEND=exec                                              
-    serverspec junit=true tag=~skip_in_kitchen check:role:$EC2DATA_TYPE               
-    SERVERSPEC
+provisioner:
+  name: ansible_playbook
+  ansible_extra_flags: <%= ENV['ANSIBLE_EXTRA_FLAGS'] %>
 ```
 
-where `serverspec` is a wrapper around `rake` invocation.
-Use a `Rakefile` similar to one in https://github.com/vincentbernat/serverspec-example.
+run:
 
-With such approach we can achieve flexibility of running same test suite both in test kitchen and actual, even production, instances.
+`ANSIBLE_EXTRA_FLAGS='--start-at-task="myrole | name of last working instruction"' kitchen converge`
 
-Beware: kitchen-shell-verifier is not yet merged into test-kitchen upstream so using separate gem is unavoidable so far
+You save a LOT of time not running working instructions.

data/lib/kitchen-ansible/version.rb

@@ -1,5 +1,5 @@
 module Kitchen
   module Ansible
-    VERSION = "0.0.27"
+    VERSION = "0.0.28"
   end
 end

data/lib/kitchen/provisioner/ansible_playbook.rb

@@ -223,6 +223,7 @@ module Kitchen
         prepare_additional_copy_path
         prepare_host_vars
         prepare_hosts
+        prepare_spec
         prepare_filter_plugins
         prepare_lookup_plugins
         prepare_ansible_vault_password_file
@@ -279,6 +280,9 @@ module Kitchen
         else
           cmd = ansible_command("ansible-playbook")
         end
+        if config[:ansible_binary_path]
+          cmd = ansible_command("#{config[:ansible_binary_path]}/ansible-playbook")
+        end
         if https_proxy
           cmd = "HTTPS_PROXY=#{https_proxy} #{cmd}"
         end
@@ -337,7 +341,7 @@ module Kitchen
           #{export_http_proxy}
           git clone git://github.com/ansible/ansible.git --recursive #{config[:root_path]}/ansible
           #{sudo_env('easy_install')} pip
-          #{sudo_env('pip')} install paramiko PyYAML Jinja2 httplib2
+          #{sudo_env('pip')} install six paramiko PyYAML Jinja2 httplib2
         fi
         INSTALL
       end
@@ -446,6 +450,10 @@ module Kitchen
         File.join(sandbox_path, 'roles')
       end
 
+      def tmp_spec_dir
+        File.join(sandbox_path, 'spec')
+      end
+
       def tmp_filter_plugins_dir
         File.join(sandbox_path, 'filter_plugins')
       end
@@ -490,6 +498,10 @@ module Kitchen
         config[:modules_path]
       end
 
+      def spec
+        'spec'
+      end
+
       def group_vars
         config[:group_vars_path].to_s
       end
@@ -789,6 +801,19 @@ module Kitchen
         end
       end
 
+      def prepare_spec
+        info('Preparing spec')
+
+        FileUtils.mkdir_p(tmp_spec_dir)
+
+        if spec && File.directory?(spec)
+          debug("Using spec from #{spec}")
+          FileUtils.cp_r(Dir.glob("#{spec}/*"), tmp_spec_dir, remove_destination: true)
+        else
+          info 'nothing to do for spec'
+        end
+      end
+
       def prepare_filter_plugins
         info('Preparing filter_plugins')
         FileUtils.mkdir_p(tmp_filter_plugins_dir)

data/provisioner_options.md

@@ -9,6 +9,7 @@ ansible_platform | naively tries to determine | OS platform of server
 require_ansible_repo | true | Set if using a ansible install from yum or apt repo
 ansible_apt_repo | "ppa:ansible/ansible" | apt repo. see https://launchpad.net /~ansible/+archive/ubuntu/ansible or rquillo/ansible
 ansible_yum_repo | https://download.fedoraproject.org /pub/epel/6/i386/epel-release-6-8.noarch.rpm | yum repo RH/Centos6
+ansible_binary_path | NULL | If specified this will override the location where kitchen tries to run ansible-playbook from. ie: (ansible_binary_path: /usr/local/bin )
 _for RH/Centos7 change to_ | http://dl.fedoraproject.org /pub/epel/7/x86_64/e/epel-release-7-5.noarch.rpm | 
 enable_yum_epel  | false | enable yum EPEL repo  
 ansible_sles_repo | http://download.opensuse.org/repositories /systemsmanagement/SLE_12/systemsmanagement.repo | zypper suse ansible repo

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-ansible
 version: !ruby/object:Gem::Version
-  version: 0.0.27
+  version: 0.0.28
 platform: ruby
 authors:
 - Neill Turner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-27 00:00:00.000000000 Z
+date: 2015-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen