diff options
| author | Tim Smith <tsmith@chef.io> | 2019-09-16 21:14:59 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-16 21:14:59 -0700 |
| commit | f6d445c28467b5ea5741d05aed2bd1f657c4a1dd (patch) | |
| tree | ece4bd29e203032f45fbf2e45cc94fb5551dfcc4 | |
| parent | a7938b8af1892438223f7bb468697d7097fe67a1 (diff) | |
| parent | 5561e673096e7f99ce63bb3f5aada06d690a6a51 (diff) | |
| download | chef-f6d445c28467b5ea5741d05aed2bd1f657c4a1dd.tar.gz | |
Merge pull request #8889 from chef/nuke_travis
Remove some references to Travis from code comments
| -rw-r--r-- | omnibus_overrides.rb | 3 | ||||
| -rw-r--r-- | spec/functional/resource/ifconfig_spec.rb | 2 | ||||
| -rw-r--r-- | spec/functional/resource/mount_spec.rb | 4 |
3 files changed, 1 insertions, 8 deletions
diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb index cd8d0f1cd8..9399504d59 100644 --- a/omnibus_overrides.rb +++ b/omnibus_overrides.rb @@ -1,6 +1,5 @@ # THIS IS NOW HAND MANAGED, JUST EDIT THE THING -# .travis.yml and appveyor.yml consume this, -# try to keep it machine-parsable. +# keep it machine-parsable since CI uses it # # NOTE: You MUST update omnibus-software when adding new versions of # software here: bundle exec rake dependencies:update_omnibus_gemfile_lock diff --git a/spec/functional/resource/ifconfig_spec.rb b/spec/functional/resource/ifconfig_spec.rb index 3ea7054a9f..23a5579311 100644 --- a/spec/functional/resource/ifconfig_spec.rb +++ b/spec/functional/resource/ifconfig_spec.rb @@ -24,8 +24,6 @@ require "chef/mixin/shell_out" include_flag = !(%w{amazon debian aix}.include?(ohai[:platform_family]) || (ohai[:platform_family] == "rhel" && ohai[:platform_version].to_i < 7)) describe Chef::Resource::Ifconfig, :requires_root, external: include_flag do - # This test does not work in travis because there is no eth0 - include Chef::Mixin::ShellOut let(:new_resource) do diff --git a/spec/functional/resource/mount_spec.rb b/spec/functional/resource/mount_spec.rb index be05d5d443..4052480b5e 100644 --- a/spec/functional/resource/mount_spec.rb +++ b/spec/functional/resource/mount_spec.rb @@ -25,13 +25,9 @@ require "tmpdir" include_flag = !(%w{debian rhel amazon aix solaris2}.include?(ohai[:platform_family])) describe Chef::Resource::Mount, :requires_root, external: include_flag do - # Disabled in travis because it refuses to let us mount a ramdisk. /dev/ramX does not - # exist even after loading the kernel module - include Chef::Mixin::ShellOut # Platform specific setup, cleanup and validation helpers. - def setup_device_for_mount # use ramdisk for creating a test device for mount. # This can cleaner if we have chef resource/provider for ramdisk. |