diff options
| author | lamont-granquist <lamont@scriptkiddie.org> | 2014-08-13 09:15:30 -0700 |
|---|---|---|
| committer | lamont-granquist <lamont@scriptkiddie.org> | 2014-08-13 09:15:30 -0700 |
| commit | 6ad12bac9cd0b736915dcafe9232d168bc1e0dc6 (patch) | |
| tree | 9ea4f65baccca8fbf5eab6e04e14c9f2849585e7 | |
| parent | 3430755dd78bfd67485bdc0d7a5e2b55bc2059a1 (diff) | |
| parent | ab2f1412c648ad8c6c17838c464d34eec508c589 (diff) | |
| download | chef-6ad12bac9cd0b736915dcafe9232d168bc1e0dc6.tar.gz | |
Merge pull request #1811 from opscode/lcg/rhel-7-e2e
add rhel 7 e2e test
| -rw-r--r-- | lib/chef/provider/package/yum.rb | 2 | ||||
| -rw-r--r-- | spec/e2e/.kitchen.travis.yml | 10 |
2 files changed, 12 insertions, 0 deletions
diff --git a/lib/chef/provider/package/yum.rb b/lib/chef/provider/package/yum.rb index d15f22ae16..e77319c254 100644 --- a/lib/chef/provider/package/yum.rb +++ b/lib/chef/provider/package/yum.rb @@ -19,6 +19,7 @@ require 'chef/config' require 'chef/provider/package' require 'chef/mixin/command' +require 'chef/mixin/shell_out' require 'chef/resource/package' require 'singleton' require 'chef/mixin/get_source_from_package' @@ -645,6 +646,7 @@ class Chef # Cache for our installed and available packages, pulled in from yum-dump.py class YumCache include Chef::Mixin::Command + include Chef::Mixin::ShellOut include Singleton def initialize diff --git a/spec/e2e/.kitchen.travis.yml b/spec/e2e/.kitchen.travis.yml index 7825dd97a4..7b256fcdb2 100644 --- a/spec/e2e/.kitchen.travis.yml +++ b/spec/e2e/.kitchen.travis.yml @@ -19,6 +19,16 @@ platforms: availability_zone: "us-west-2b" ssh_key: <%= ENV['EC2_SSH_KEY_PATH'] %> security_group_ids: ["travis-ci"] + - name: rhel-7.0 + driver_plugin: ec2 + driver_config: + region: "us-west-2" + availability_zone: "us-west-2b" + ssh_key: <%= ENV['EC2_SSH_KEY_PATH'] %> + security_group_ids: ["travis-ci"] + image_id: ami-77d7a747 + flavor_id: m3.medium + username: ec2-user suites: - name: default |