diff options
| author | Tim Smith <tsmith@chef.io> | 2019-03-31 16:16:44 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-31 16:16:44 -0700 |
| commit | 2815e7db8ec6402f6562632af9ced742f2d46b0c (patch) | |
| tree | c662875d0b6c5364a2d90f1411c4dec8d7300e51 | |
| parent | 5cd1e6ad712772801581874992380936dbba53d2 (diff) | |
| parent | 9f712d56d665cc0c7182cac561bf5db63db5ae0c (diff) | |
| download | chef-2815e7db8ec6402f6562632af9ced742f2d46b0c.tar.gz | |
Merge pull request #8330 from chef/nuke_1404
Remove Ubuntu 14.04 testing
| -rw-r--r-- | .travis.yml | 16 | ||||
| -rw-r--r-- | kitchen-tests/kitchen.travis.yml | 7 | ||||
| -rw-r--r-- | kitchen-tests/kitchen.yml | 2 | ||||
| -rw-r--r-- | omnibus/kitchen.yml | 2 |
4 files changed, 1 insertions, 26 deletions
diff --git a/.travis.yml b/.travis.yml index 739b630ff9..332c7e9597 100644 --- a/.travis.yml +++ b/.travis.yml @@ -158,22 +158,6 @@ matrix: - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER ) - cd kitchen-tests script: - - bundle exec kitchen test end-to-end-ubuntu-1404 - after_failure: - - cat .kitchen/logs/kitchen.log - env: - - UBUNTU=14.04 - - KITCHEN_YAML=kitchen.travis.yml - - rvm: 2.5.5 - services: docker - gemfile: kitchen-tests/Gemfile - before_install: - - gem update --system $(grep rubygems omnibus_overrides.rb | cut -d'"' -f2) - - gem install bundler -v $(grep :bundler omnibus_overrides.rb | cut -d'"' -f2) - before_script: - - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER ) - - cd kitchen-tests - script: - bundle exec kitchen test end-to-end-ubuntu-1604 after_failure: - cat .kitchen/logs/kitchen.log 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 diff --git a/omnibus/kitchen.yml b/omnibus/kitchen.yml index aad8222c58..032ed6552b 100644 --- a/omnibus/kitchen.yml +++ b/omnibus/kitchen.yml @@ -39,8 +39,6 @@ platforms: run_list: apt::default - name: freebsd-11 run_list: freebsd::portsnap - - name: ubuntu-14.04 - run_list: apt::default - name: ubuntu-16.04 run_list: apt::default - name: ubuntu-18.04 |