summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2017-04-05 12:07:56 -0700
committerTim Smith <tsmith@chef.io>2017-04-05 12:07:56 -0700
commitf936352a3dfb28287507b5ad73a34e8700098663 (patch)
tree0c1b48dfd41d389ff2bef23cd8c58d45a48c91b0
parent2113bdaa970f73148c6499628089e9605999afc1 (diff)
downloadchef-integration_test_tweaks.tar.gz
Remove 12.04 testing in Travisintegration_test_tweaks
12.04 is goes EOL on 4/28. http://fridge.ubuntu.com/2017/03/15/ubuntu-12-04-precise-pangolin-reaches-end-of-life-on-april-28-2017/ Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--.travis.yml18
-rw-r--r--kitchen-tests/.kitchen.travis.yml8
-rw-r--r--kitchen-tests/.kitchen.yml1
3 files changed, 0 insertions, 27 deletions
diff --git a/.travis.yml b/.travis.yml
index 87c0fe74ee..85881f6f18 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -115,24 +115,6 @@ matrix:
- sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
- cd kitchen-tests
script:
- - bundle exec kitchen test webapp-ubuntu-1204
- after_failure:
- - cat .kitchen/logs/kitchen.log
- env:
- - UBUNTU=12.04
- - KITCHEN_YAML=.kitchen.travis.yml
- - rvm: 2.4.1
- services: docker
- sudo: required
- 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)
- bundler_args: --without ci development docgen guard integration maintenance omnibus_package tools aix bsd mac_os_x solaris windows --frozen
- before_script:
- - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
- - cd kitchen-tests
- script:
- bundle exec kitchen test webapp-ubuntu-1404
after_failure:
- cat .kitchen/logs/kitchen.log
diff --git a/kitchen-tests/.kitchen.travis.yml b/kitchen-tests/.kitchen.travis.yml
index 6a66daffe6..3dcc5c64a7 100644
--- a/kitchen-tests/.kitchen.travis.yml
+++ b/kitchen-tests/.kitchen.travis.yml
@@ -83,14 +83,6 @@ platforms:
- RUN yum makecache
- RUN sed -i -e "s/Defaults.*requiretty.*/Defaults !requiretty/g" /etc/sudoers
-- name: ubuntu-12.04
- driver:
- image: ubuntu-upstart:12.04
- pid_one_command: /sbin/init
- intermediate_instructions:
- - RUN /usr/bin/apt-get update
- - RUN /usr/bin/apt-get -y install zlib1g-dev sudo net-tools wget ca-certificates
-
- name: ubuntu-14.04
driver:
image: ubuntu-upstart:14.04
diff --git a/kitchen-tests/.kitchen.yml b/kitchen-tests/.kitchen.yml
index 33841b0b94..87981781db 100644
--- a/kitchen-tests/.kitchen.yml
+++ b/kitchen-tests/.kitchen.yml
@@ -22,7 +22,6 @@ provisioner:
diff_disabled: true
platforms:
- - name: ubuntu-12.04
- name: ubuntu-14.04
- name: ubuntu-16.04
- name: centos-7.2