From c7c16fdc4a297f1a1ee518027b7b50e6d0fb1679 Mon Sep 17 00:00:00 2001 From: Scott Nelson Windels Date: Wed, 14 Dec 2016 21:13:21 -0800 Subject: [PATCH] Test CentOS7 update in .kitchen.docker.yml file Pin ark for travis testing due to bug in ark 2.2.0 Pin elasticsearch at 2.4.0 for testing pre ES-5.0 Fix Centos-6.4 version, start working on ubuntu 16.04 systemd issue Fix path to init for ubuntu1604 --- .kitchen.docker.yml | 14 +++++++++++++- Berksfile | 3 ++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.kitchen.docker.yml b/.kitchen.docker.yml index bf8d18e..636b65f 100644 --- a/.kitchen.docker.yml +++ b/.kitchen.docker.yml @@ -1,4 +1,16 @@ --- driver: name: docker - privileged: true \ No newline at end of file + privileged: true + +platforms: + - name: ubuntu-14.04 + - name: ubuntu-16.04 + driver_config: + run_command: /sbin/init + - name: centos-6.4 + - name: centos-7.2 + driver_config: + image: centos:7 + provision_command: yum -y install initscripts + run_command: /usr/sbin/init diff --git a/Berksfile b/Berksfile index 3ffb863..34a0f9c 100644 --- a/Berksfile +++ b/Berksfile @@ -3,9 +3,10 @@ source 'https://supermarket.chef.io/' metadata group :vagrant do + cookbook 'ark', '= 2.1.0' cookbook 'apt' cookbook 'apache2' - cookbook 'elasticsearch' + cookbook 'elasticsearch', '~ 2.4.0' cookbook 'java' cookbook 'ohai' cookbook 'netstat'