Commit adedbf73 authored by Tim Smith's avatar Tim Smith

Test on Ubuntu 18.04 and Chef 13/14 in Travis

Expand our testing a bit.
Signed-off-by: default avatarTim Smith <tsmith@chef.io>
parent d467e949
...@@ -42,8 +42,6 @@ vendor/ ...@@ -42,8 +42,6 @@ vendor/
.coverage/ .coverage/
.zero-knife.rb .zero-knife.rb
Policyfile.lock.json Policyfile.lock.json
Cheffile.lock
.librarian/
# vagrant stuff # vagrant stuff
.vagrant/ .vagrant/
......
sudo: required sudo: required
dist: trusty
addons: addons:
apt: apt:
...@@ -19,15 +18,32 @@ services: docker ...@@ -19,15 +18,32 @@ services: docker
env: env:
matrix: matrix:
- INSTANCE=default-ubuntu-1604 - CHEF_VERSION=13 INSTANCE=default-ubuntu-1604
- INSTANCE=default-debian-8 - CHEF_VERSION=13 INSTANCE=default-ubuntu-1804
- INSTANCE=default-centos-6 - CHEF_VERSION=13 INSTANCE=default-debian-8
- INSTANCE=default-centos-7 - CHEF_VERSION=13 INSTANCE=default-debian-9
- INSTANCE=default-fedora-latest - CHEF_VERSION=13 INSTANCE=default-centos-6
- INSTANCE=source-ubuntu-1604 - CHEF_VERSION=13 INSTANCE=default-centos-7
- INSTANCE=source-debian-8 - CHEF_VERSION=13 INSTANCE=default-fedora-latest
- INSTANCE=source-fedora-latest - CHEF_VERSION=13 INSTANCE=source-ubuntu-1604
- INSTANCE=source-centos-7 - CHEF_VERSION=13 INSTANCE=source-ubuntu-1804
- CHEF_VERSION=13 INSTANCE=source-debian-8
- CHEF_VERSION=13 INSTANCE=source-debian-9
- CHEF_VERSION=13 INSTANCE=source-fedora-latest
- CHEF_VERSION=13 INSTANCE=source-centos-7
- CHEF_VERSION=14 INSTANCE=default-ubuntu-1604
- CHEF_VERSION=14 INSTANCE=default-ubuntu-1804
- CHEF_VERSION=14 INSTANCE=default-debian-8
- CHEF_VERSION=14 INSTANCE=default-debian-9
- CHEF_VERSION=14 INSTANCE=default-centos-6
- CHEF_VERSION=14 INSTANCE=default-centos-7
- CHEF_VERSION=14 INSTANCE=default-fedora-latest
- CHEF_VERSION=14 INSTANCE=source-ubuntu-1604
- CHEF_VERSION=14 INSTANCE=source-ubuntu-1804
- CHEF_VERSION=14 INSTANCE=source-debian-8
- CHEF_VERSION=14 INSTANCE=source-debian-9
- CHEF_VERSION=14 INSTANCE=source-fedora-latest
- CHEF_VERSION=14 INSTANCE=source-centos-7
before_script: before_script:
- sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER ) - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
...@@ -36,7 +52,7 @@ before_script: ...@@ -36,7 +52,7 @@ before_script:
- cookstyle --version - cookstyle --version
- foodcritic --version - foodcritic --version
script: KITCHEN_LOCAL_YAML=kitchen.dokken.yml kitchen verify ${INSTANCE} script: KITCHEN_LOCAL_YAML=kitchen.dokken.yml CHEF_VERSION=${CHEF_VERSION} kitchen verify ${INSTANCE}
matrix: matrix:
include: include:
......
...@@ -19,6 +19,11 @@ platforms: ...@@ -19,6 +19,11 @@ platforms:
image: dokken/amazonlinux image: dokken/amazonlinux
pid_one_command: /sbin/init pid_one_command: /sbin/init
- name: amazonlinux-2
driver:
image: dokken/amazonlinux-2
pid_one_command: /usr/lib/systemd/systemd
- name: debian-8 - name: debian-8
driver: driver:
image: dokken/debian-8 image: dokken/debian-8
...@@ -48,16 +53,16 @@ platforms: ...@@ -48,16 +53,16 @@ platforms:
image: dokken/fedora-latest image: dokken/fedora-latest
pid_one_command: /usr/lib/systemd/systemd pid_one_command: /usr/lib/systemd/systemd
- name: ubuntu-14.04 - name: ubuntu-16.04
driver: driver:
image: dokken/ubuntu-14.04 image: dokken/ubuntu-16.04
pid_one_command: /sbin/init pid_one_command: /bin/systemd
intermediate_instructions: intermediate_instructions:
- RUN /usr/bin/apt-get update - RUN /usr/bin/apt-get update
- name: ubuntu-16.04 - name: ubuntu-18.04
driver: driver:
image: dokken/ubuntu-16.04 image: dokken/ubuntu-18.04
pid_one_command: /bin/systemd pid_one_command: /bin/systemd
intermediate_instructions: intermediate_instructions:
- RUN /usr/bin/apt-get update - RUN /usr/bin/apt-get update
......
...@@ -3,8 +3,12 @@ driver: ...@@ -3,8 +3,12 @@ driver:
provisioner: provisioner:
name: chef_zero name: chef_zero
deprecations_as_errors: true
platforms: platforms:
- name: amazonlinux
driver_config:
box: mvbcoding/awslinux
- name: centos-6 - name: centos-6
- name: centos-7 - name: centos-7
- name: debian-8 - name: debian-8
...@@ -15,6 +19,8 @@ platforms: ...@@ -15,6 +19,8 @@ platforms:
- name: opensuse-leap-42 - name: opensuse-leap-42
- name: ubuntu-16.04 - name: ubuntu-16.04
run_list: apt::default run_list: apt::default
- name: ubuntu-18.04
run_list: apt::default
suites: suites:
- name: default - name: default
...@@ -37,7 +43,7 @@ suites: ...@@ -37,7 +43,7 @@ suites:
- recipe[erlang::esl] - recipe[erlang::esl]
excludes: excludes:
- fedora-28 - fedora-28
- opensuse-42 - opensuse-leap-42
- name: source - name: source
run_list: run_list:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment