Support Chef 14 in Test Kitchen scenarios
- Chef 14 support has stablized, so we want to start using it. - Docker support needed some tweaks for the AIO scenario to converge with Chef 14. Change-Id: I8aac7a2e5d07caa66a2926873f2fbd7c2ace9650
This commit is contained in:
parent
a65f9d6579
commit
670db4e110
@ -2,10 +2,11 @@
|
|||||||
driver:
|
driver:
|
||||||
name: dokken
|
name: dokken
|
||||||
privileged: true
|
privileged: true
|
||||||
chef_version: 13
|
chef_version: 14
|
||||||
volumes:
|
volumes:
|
||||||
- /sys/fs/cgroup:/sys/fs/cgroup:ro
|
- /sys/fs/cgroup:/sys/fs/cgroup
|
||||||
- /sys/fs/selinux:/sys/fs/selinux:rw
|
- /lib/modules:/lib/modules:ro
|
||||||
|
- /run/openvswitch:/run/openvswitch
|
||||||
|
|
||||||
transport:
|
transport:
|
||||||
name: dokken
|
name: dokken
|
||||||
@ -22,19 +23,31 @@ platforms:
|
|||||||
driver:
|
driver:
|
||||||
image: dokken/ubuntu-16.04
|
image: dokken/ubuntu-16.04
|
||||||
pid_one_command: /bin/systemd
|
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
|
- name: centos-7
|
||||||
platform: rhel
|
platform: rhel
|
||||||
driver:
|
driver:
|
||||||
image: dokken/centos-7
|
image: dokken/centos-7
|
||||||
pid_one_command: /usr/lib/systemd/systemd
|
pid_one_command: /usr/lib/systemd/systemd
|
||||||
intermediate_instructions:
|
|
||||||
- RUN yum -y install which net-tools
|
|
||||||
|
|
||||||
suites:
|
suites:
|
||||||
- name: default
|
- name: default
|
||||||
|
driver:
|
||||||
|
ports:
|
||||||
|
- '80'
|
||||||
|
- '8080'
|
||||||
|
- '443'
|
||||||
|
- '3460'
|
||||||
|
- '3306'
|
||||||
|
- '5672'
|
||||||
|
- '5000'
|
||||||
|
- '35357'
|
||||||
|
- '8774'
|
||||||
|
- '8776'
|
||||||
|
- '9292'
|
||||||
|
- '9696'
|
||||||
|
- '8000'
|
||||||
|
- '8003'
|
||||||
|
- '8004'
|
||||||
run_list:
|
run_list:
|
||||||
# run_list taken from roles/allinone.json
|
# run_list taken from roles/allinone.json
|
||||||
- recipe[selinux::disabled]
|
- recipe[selinux::disabled]
|
||||||
|
@ -14,7 +14,7 @@ provisioner:
|
|||||||
# always_update_cookbooks: <%= !ENV['CI'] %>
|
# always_update_cookbooks: <%= !ENV['CI'] %>
|
||||||
always_update_cookbooks: true
|
always_update_cookbooks: true
|
||||||
product_name: chef
|
product_name: chef
|
||||||
product_version: 13
|
product_version: 14
|
||||||
# Copy secret to /tmp/kitchen on test VM. Kitchen tries to gather secrets
|
# 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
|
# before any recipes had a chance to run -> we cannot use a recipe to put the
|
||||||
# secrets file in place.
|
# secrets file in place.
|
||||||
|
@ -20,7 +20,7 @@ provisioner:
|
|||||||
# always_update_cookbooks: <%= !ENV['CI'] %>
|
# always_update_cookbooks: <%= !ENV['CI'] %>
|
||||||
always_update_cookbooks: true
|
always_update_cookbooks: true
|
||||||
product_name: chef
|
product_name: chef
|
||||||
product_version: 13
|
product_version: 14
|
||||||
# Copy secret to /tmp/kitchen on test VM. Kitchen tries to gather secrets
|
# 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
|
# before any recipes had a chance to run -> we cannot use a recipe to put the
|
||||||
# secrets file in place.
|
# secrets file in place.
|
||||||
|
Loading…
Reference in New Issue
Block a user