diff options
author | Lamont Granquist <lamont@scriptkiddie.org> | 2016-08-22 11:56:13 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-08-22 11:56:13 -0700 |
commit | c737f815a93cb38c7f3affa357d98c6f3bfcdad1 (patch) | |
tree | 9aa020e96efb1c544f426524459b1434dd548fdb | |
parent | 51d320d89dc408f1d3a0b520cb039ea051ebd124 (diff) | |
parent | c855131d3bbb48a4f1dc56db96455e44348e1fac (diff) | |
download | chef-c737f815a93cb38c7f3affa357d98c6f3bfcdad1.tar.gz |
Merge pull request #5220 from chef/lcg/drop-2.1-support
remove ruby 2.1 support
-rw-r--r-- | .travis.yml | 5 | ||||
-rw-r--r-- | Gemfile | 1 | ||||
-rw-r--r-- | Gemfile.lock | 3 | ||||
-rw-r--r-- | chef.gemspec | 2 | ||||
-rw-r--r-- | kitchen-tests/.kitchen.travis.yml | 20 |
5 files changed, 12 insertions, 19 deletions
diff --git a/.travis.yml b/.travis.yml index d8ff98ad7b..afbc8a8a96 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,11 +30,6 @@ env: matrix: include: - - rvm: 2.1.9 - sudo: true - script: sudo -E $(which bundle) exec rake spec; - # also remove integration / external tests - bundler_args: --without changelog development docgen guard integration maintenance omnibus_package tools aix bsd mac_os_x solaris windows --frozen - rvm: 2.2.5 sudo: true script: sudo -E $(which bundle) exec rake spec; @@ -66,7 +66,6 @@ end group(:development, :test) do gem "simplecov" - gem "rack", "< 2.0" # 2.0 requires Ruby 2.2+ # for testing new chefstyle rules # gem 'chefstyle', github: 'chef/chefstyle' diff --git a/Gemfile.lock b/Gemfile.lock index 68ebda1a14..a9ea8ec692 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -173,7 +173,7 @@ GEM net-ssh ffi (1.9.14) ffi (1.9.14-x86-mingw32) - ffi-win32-extensions (1.0.2) + ffi-win32-extensions (1.0.3) ffi ffi-yajl (2.3.0) libyajl2 (~> 1.2) @@ -463,7 +463,6 @@ DEPENDENCIES pry-byebug pry-remote pry-stack_explorer - rack (< 2.0) rake rb-readline ruby-prof diff --git a/chef.gemspec b/chef.gemspec index 920a269de0..78db042376 100644 --- a/chef.gemspec +++ b/chef.gemspec @@ -13,7 +13,7 @@ Gem::Specification.new do |s| s.email = "adam@chef.io" s.homepage = "http://www.chef.io" - s.required_ruby_version = ">= 2.1.0" + s.required_ruby_version = ">= 2.2.0" s.add_dependency "chef-config", "= #{Chef::VERSION}" diff --git a/kitchen-tests/.kitchen.travis.yml b/kitchen-tests/.kitchen.travis.yml index dd92b832dc..9c5854d923 100644 --- a/kitchen-tests/.kitchen.travis.yml +++ b/kitchen-tests/.kitchen.travis.yml @@ -10,7 +10,7 @@ transport: provisioner: name: chef_github root_path: /opt/kitchen - chef_version: latest + require_chef_omnibus: latest chef_omnibus_url: "https://omnitruck.chef.io/install.sh" chef_omnibus_install_options: "-c current" github_owner: "chef" @@ -33,7 +33,7 @@ platforms: 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 + - RUN /usr/bin/apt-get -y install zlib1g-dev sudo net-tools wget ca-certificates - RUN /bin/mkdir /var/run/sshd - name: debian-8 @@ -42,7 +42,7 @@ platforms: pid_one_command: /bin/systemd intermediate_instructions: - RUN /usr/bin/apt-get update - - RUN /usr/bin/apt-get -y install zlib1g-dev sudo net-tools + - RUN /usr/bin/apt-get -y install zlib1g-dev sudo net-tools wget ca-certificates - name: centos-5 driver: @@ -51,7 +51,7 @@ platforms: run_command: /sbin/init intermediate_instructions: - RUN yum clean all - - RUN yum install -y which initscripts net-tools sudo + - RUN yum install -y which initscripts net-tools sudo wget - RUN sed -i -e "s/Defaults.*requiretty.*/Defaults !requiretty/g" /etc/sudoers - name: centos-6 @@ -60,7 +60,7 @@ platforms: run_command: /sbin/init intermediate_instructions: - RUN yum clean all - - RUN yum -y install which initscripts net-tools sudo + - RUN yum -y install which initscripts net-tools sudo wget - RUN sed -i -e "s/Defaults.*requiretty.*/Defaults !requiretty/g" /etc/sudoers - name: centos-7 @@ -69,7 +69,7 @@ platforms: pid_one_command: /usr/lib/systemd/systemd intermediate_instructions: - RUN yum clean all - - RUN yum -y install which initscripts net-tools sudo + - RUN yum -y install which initscripts net-tools sudo wget - RUN sed -i -e "s/Defaults.*requiretty.*/Defaults !requiretty/g" /etc/sudoers - name: fedora-23 @@ -77,7 +77,7 @@ platforms: image: fedora:23 pid_one_command: /usr/lib/systemd/systemd intermediate_instructions: - - RUN dnf -y install yum which initscripts rpm-build zlib-devel net-tools sudo + - RUN dnf -y install yum which initscripts rpm-build zlib-devel net-tools sudo wget - RUN sed -i -e "s/Defaults.*requiretty.*/Defaults !requiretty/g" /etc/sudoers - name: ubuntu-12.04 @@ -86,7 +86,7 @@ platforms: 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 + - RUN /usr/bin/apt-get -y install zlib1g-dev sudo net-tools wget ca-certificates - name: ubuntu-14.04 driver: @@ -94,7 +94,7 @@ platforms: 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 + - RUN /usr/bin/apt-get -y install zlib1g-dev sudo net-tools wget ca-certificates - name: ubuntu-16.04 driver: @@ -102,7 +102,7 @@ platforms: pid_one_command: /bin/systemd intermediate_instructions: - RUN /usr/bin/apt-get update - - RUN /usr/bin/apt-get -y install zlib1g-dev sudo net-tools + - RUN /usr/bin/apt-get -y install zlib1g-dev sudo net-tools wget ca-certificates - name: opensuse-13.2 driver: |