Merge pull request #102 from Alfresco/develop

Develop

.kitchen.docker.yml

@@ -7,16 +7,16 @@ driver:
   privileged: true
 
 provisioner:
-  name: chef_solo
+  name: chef_zero
 
 
 platforms:
   - name: centos-7
     driver_config:
       image: centos:7
       platform: centos
-      privileged: true
       run_command: /usr/sbin/init
+      privileged: true
       forward:
       - 80:80
       - 8070:8070
@@ -25,7 +25,6 @@ platforms:
       - 9001:9001
       - 9000:9000
 
-
 suites:
   - name: community
     run_list:

.kitchen.yml

@@ -19,8 +19,6 @@ platforms:
     driver:
       box_url: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-7.2_chef-provisionerless.box
 
-verifier:
-  name: inspec
 
 suites:
   - name: community

.travis.yml

@@ -1,6 +1,14 @@
-language: ruby
+rvm: 2.2
 
-rvm:
-  - 2.1.4
+sudo: required
+services: docker
 
-bundler_args: --without integration development
+before_install: curl -L https://www.getchef.com/chef/install.sh | sudo bash -s -- -P chefdk -v 0.9.0
+install: chef exec bundle install
+
+before_script: sudo iptables -L DOCKER || sudo iptables -N DOCKER
+
+script:
+  - chef exec bundle exec rake
+  # Run test-kitchen with docker driver, for example:
+  - chef exec bundle exec rake 'integration:docker[community,test]'

Berksfile.lock

@@ -26,7 +26,7 @@ GRAPH
     windows (>= 1.2.2)
   activemq (2.0.4)
     java (~> 1.13)
-  alfresco (0.6.29)
+  alfresco (0.6.45)
     activemq (>= 1.3.3)
     artifact-deployer (>= 0.8.16)
     build-essential (>= 2.2.3)