summaryrefslogtreecommitdiff
path: root/kitchen-tests
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2019-03-31 16:16:44 -0700
committerGitHub <noreply@github.com>2019-03-31 16:16:44 -0700
commit2815e7db8ec6402f6562632af9ced742f2d46b0c (patch)
treec662875d0b6c5364a2d90f1411c4dec8d7300e51 /kitchen-tests
parent5cd1e6ad712772801581874992380936dbba53d2 (diff)
parent9f712d56d665cc0c7182cac561bf5db63db5ae0c (diff)
downloadchef-2815e7db8ec6402f6562632af9ced742f2d46b0c.tar.gz
Merge pull request #8330 from chef/nuke_1404
Remove Ubuntu 14.04 testing
Diffstat (limited to 'kitchen-tests')
-rw-r--r--kitchen-tests/kitchen.travis.yml7
-rw-r--r--kitchen-tests/kitchen.yml2
2 files changed, 1 insertions, 8 deletions
diff --git a/kitchen-tests/kitchen.travis.yml b/kitchen-tests/kitchen.travis.yml
index 160f92eb51..f65dcdc420 100644
--- a/kitchen-tests/kitchen.travis.yml
+++ b/kitchen-tests/kitchen.travis.yml
@@ -79,13 +79,6 @@ platforms:
intermediate_instructions:
- RUN sed -i -e "s/Defaults.*requiretty.*/Defaults !requiretty/g" /etc/sudoers
-- name: ubuntu-14.04
- driver:
- image: dokken/ubuntu-14.04
- pid_one_command: /sbin/init
- intermediate_instructions:
- - RUN /usr/bin/apt-get update
-
- name: ubuntu-16.04
driver:
image: dokken/ubuntu-16.04
diff --git a/kitchen-tests/kitchen.yml b/kitchen-tests/kitchen.yml
index fd8e5383ea..1cda8e1b64 100644
--- a/kitchen-tests/kitchen.yml
+++ b/kitchen-tests/kitchen.yml
@@ -24,12 +24,12 @@ platforms:
- name: amazonlinux
driver_config:
box: mvbcoding/awslinux
+ - name: amazonlinux-2
- name: centos-6
- name: centos-7
- name: debian-8
- name: debian-9
- name: opensuse-leap-42
- - name: ubuntu-14.04
- name: ubuntu-16.04
- name: ubuntu-18.04