Merge "Support Chef 14 in Test Kitchen scenarios"

This commit is contained in:
Zuul 2018-04-30 09:01:45 +00:00 committed by Gerrit Code Review
commit 1ab0e70201
3 changed files with 23 additions and 10 deletions

View File

@ -2,10 +2,11 @@
driver:
name: dokken
privileged: true
chef_version: 13
chef_version: 14
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:ro
- /sys/fs/selinux:/sys/fs/selinux:rw
- /sys/fs/cgroup:/sys/fs/cgroup
- /lib/modules:/lib/modules:ro
- /run/openvswitch:/run/openvswitch
transport:
name: dokken
@ -22,19 +23,31 @@ platforms:
driver:
image: dokken/ubuntu-16.04
pid_one_command: /bin/systemd
intermediate_instructions:
- RUN /usr/bin/apt-get update
- RUN /usr/bin/apt-get install apt-transport-https lsb-release procps net-tools sudo -y
- name: centos-7
platform: rhel
driver:
image: dokken/centos-7
pid_one_command: /usr/lib/systemd/systemd
intermediate_instructions:
- RUN yum -y install which net-tools
suites:
- name: default
driver:
ports:
- '80'
- '8080'
- '443'
- '3460'
- '3306'
- '5672'
- '5000'
- '35357'
- '8774'
- '8776'
- '9292'
- '9696'
- '8000'
- '8003'
- '8004'
run_list:
# run_list taken from roles/allinone.json
- recipe[selinux::disabled]

View File

@ -14,7 +14,7 @@ provisioner:
# always_update_cookbooks: <%= !ENV['CI'] %>
always_update_cookbooks: true
product_name: chef
product_version: 13
product_version: 14
# Copy secret to /tmp/kitchen on test VM. Kitchen tries to gather secrets
# before any recipes had a chance to run -> we cannot use a recipe to put the
# secrets file in place.

View File

@ -20,7 +20,7 @@ provisioner:
# always_update_cookbooks: <%= !ENV['CI'] %>
always_update_cookbooks: true
product_name: chef
product_version: 13
product_version: 14
# Copy secret to /tmp/kitchen on test VM. Kitchen tries to gather secrets
# before any recipes had a chance to run -> we cannot use a recipe to put the
# secrets file in place.