Skip to content

Commit

Permalink
Remove apt/yum from test kitchen to speed up testing
Browse files Browse the repository at this point in the history
There's no need for this when we're just creating user accounts

Signed-off-by: Tim Smith <[email protected]>
  • Loading branch information
tas50 committed Sep 15, 2016
1 parent b9e04a4 commit 07a542c
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 26 deletions.
18 changes: 0 additions & 18 deletions .kitchen.docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,66 +33,48 @@ platforms:
image: centos:5
platform: rhel
pid_one_command: /sbin/init
intermediate_instructions:
- RUN yum install -y which initscripts wget

- name: centos-6
driver:
image: centos:6
platform: rhel
pid_one_command: /sbin/init
intermediate_instructions:
- RUN yum -y install which initscripts

- name: centos-7
driver:
image: centos:7
platform: rhel
pid_one_command: /usr/lib/systemd/systemd
intermediate_instructions:
- RUN yum -y install lsof

- name: fedora-latest
driver:
image: fedora:latest
pid_one_command: /usr/lib/systemd/systemd
intermediate_instructions:
- RUN dnf -y install yum

- name: ubuntu-12.04
driver:
image: ubuntu-upstart:12.04
pid_one_command: /sbin/init
intermediate_instructions:
- RUN /usr/bin/apt-get update

- name: ubuntu-14.04
driver:
image: ubuntu-upstart:14.04
pid_one_command: /sbin/init
intermediate_instructions:
- RUN /usr/bin/apt-get update

- name: ubuntu-16.04
driver:
image: ubuntu:16.04
pid_one_command: /bin/systemd
intermediate_instructions:
- RUN /usr/bin/apt-get update

- name: opensuse-13.2
driver:
image: opensuse:13.2
pid_one_command: /bin/systemd
intermediate_instructions:
- RUN zypper refresh

- name: opensuse-42.1
driver:
image: opensuse:42.1
pid_one_command: /bin/systemd
intermediate_instructions:
- RUN zypper refresh

suites:
- name: default
Expand Down
11 changes: 5 additions & 6 deletions .kitchen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,8 @@ platforms:
- name: centos-6.8
- name: centos-7.2
- name: debian-7.11
run_list: apt::default
- name: debian-8.5
run_list: apt::default
- name: fedora-24
run_list: yum::dnf_yum_compat
- name: freebsd-9.3
- name: freebsd-10.3
- name: macosx-10.10
Expand All @@ -27,11 +24,13 @@ platforms:
- name: opensuse-13.2
- name: opensuse-leap-42.1
- name: ubuntu-12.04
run_list: apt::default
- name: ubuntu-14.04
run_list: apt::default
- name: ubuntu-16.04
run_list: apt::default
- name: ubuntu-16.04-chef-12.1
driver_config:
box: bento/ubuntu-16.04
provisioner:
require_chef_omnibus: 12.1.0
suites:
- name: default
data_bags_path: "./test/fixtures/data_bags"
Expand Down
2 changes: 0 additions & 2 deletions Berksfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,5 @@ source 'https://supermarket.chef.io'
metadata

group :integration do
cookbook 'yum'
cookbook 'apt'
cookbook 'users_test', path: 'test/fixtures/cookbooks/users_test'
end

0 comments on commit 07a542c

Please sign in to comment.