diff options
author | John <john.mccrae@progress.com> | 2022-12-27 11:28:46 -0800 |
---|---|---|
committer | John <john.mccrae@progress.com> | 2023-01-04 09:23:07 -0800 |
commit | 628cc6888a14fd47d34ddd0a8f53c16f88e3f937 (patch) | |
tree | f00f87bb6c329c4719cd67de78c8506465958208 | |
parent | cfc6951a0e96edc8a48c2c3ba25b4e9d090a2cd4 (diff) | |
download | chef-jfm/chef18_yum_cache.tar.gz |
Adding support to remove bogus Zypper repos thatjfm/chef18_yum_cache
were causing build failures
Signed-off-by: John <john.mccrae@progress.com>
updating file_system to send back the copy status (#13107)
* updating file_system to send back the copy status
* Updating Gemfile.lock for cheffish bump
Signed-off-by: Vinay Satish <vinay.satish@progress.com>
Bump version to 18.0.207 by Chef Expeditor
Obvious fix; these changes are the result of automation not creative thinking.
Adds 'makecache_fast' property to `yum_repository` minimise cached repodata (#12915)
* Adds 'makecache_fast' property to minimise cached repodata
* add makecache_fast property to unit test
* no makecache fast on dnf systems
* correct property in unit test
Signed-off-by: Stuart Sears <stuart@sjsears.com>
Bump version to 18.0.208 by Chef Expeditor
Obvious fix; these changes are the result of automation not creative thinking.
removed a test from the kitchen.yml file
Signed-off-by: John <john.mccrae@progress.com>
-rw-r--r-- | .expeditor/adhoc-canary.omnibus.yml | 7 | ||||
-rw-r--r-- | .expeditor/release.omnibus.yml | 18 | ||||
-rw-r--r-- | .expeditor/verify.pipeline.yml | 8 | ||||
-rw-r--r-- | CHANGELOG.md | 9 | ||||
-rw-r--r-- | Gemfile.lock | 25 | ||||
-rw-r--r-- | VERSION | 2 | ||||
-rw-r--r-- | chef-bin/lib/chef-bin/version.rb | 2 | ||||
-rw-r--r-- | chef-config/lib/chef-config/version.rb | 2 | ||||
-rw-r--r-- | chef-utils/lib/chef-utils/version.rb | 2 | ||||
-rw-r--r-- | knife/Gemfile.lock | 6 | ||||
-rw-r--r-- | knife/lib/chef/knife/download.rb | 3 | ||||
-rw-r--r-- | knife/lib/chef/knife/upload.rb | 3 | ||||
-rw-r--r-- | knife/lib/chef/knife/version.rb | 2 | ||||
-rw-r--r-- | lib/chef/chef_fs/file_system.rb | 28 | ||||
-rw-r--r-- | lib/chef/provider/yum_repository.rb | 14 | ||||
-rw-r--r-- | lib/chef/resource/yum_repository.rb | 4 | ||||
-rw-r--r-- | lib/chef/version.rb | 2 | ||||
-rw-r--r-- | omnibus/Gemfile.lock | 4 | ||||
-rw-r--r-- | spec/unit/chef_fs/file_system_spec.rb | 2 | ||||
-rw-r--r-- | spec/unit/resource/yum_repository_spec.rb | 4 |
20 files changed, 96 insertions, 51 deletions
diff --git a/.expeditor/adhoc-canary.omnibus.yml b/.expeditor/adhoc-canary.omnibus.yml index 731a7fecdf..278b031d61 100644 --- a/.expeditor/adhoc-canary.omnibus.yml +++ b/.expeditor/adhoc-canary.omnibus.yml @@ -60,13 +60,12 @@ builder-to-testers-map: - mac_os_x-11-arm64 # - mac_os_x-12-arm64 canary org doesn't yet have a macos 12 arm64 omnibus worker # sles-12-s390x: - # - sles-12-s390x - # - sles-15-s390x + # - sles-15-s390x sles-12-x86_64: - sles-12-x86_64 - sles-15-x86_64 - sles-15-aarch64: - - sles-15-aarch64 + # sles-15-aarch64: + # - sles-15-aarch64 # solaris2-5.11-i386: # - solaris2-5.11-i386 # solaris2-5.11-sparc: diff --git a/.expeditor/release.omnibus.yml b/.expeditor/release.omnibus.yml index bb44478a33..32b1335dbf 100644 --- a/.expeditor/release.omnibus.yml +++ b/.expeditor/release.omnibus.yml @@ -36,9 +36,9 @@ builder-to-testers-map: - el-7-ppc64 el-7-ppc64le: - el-7-ppc64le - el-7-s390x: - - el-7-s390x - - el-8-s390x + # el-7-s390x: + # - el-7-s390x + # - el-8-s390x el-7-x86_64: - el-7-x86_64 - amazon-2-x86_64 @@ -60,14 +60,14 @@ builder-to-testers-map: mac_os_x-11-arm64: - mac_os_x-11-arm64 - mac_os_x-12-arm64 - sles-12-s390x: + sles-15-s390x: - sles-12-s390x - sles-15-s390x - sles-12-x86_64: - - sles-12-x86_64 - - sles-15-x86_64 - sles-15-aarch64: - - sles-15-aarch64 + # sles-12-x86_64: + # - sles-12-x86_64 + # - sles-15-x86_64 + # sles-15-aarch64: + # - sles-15-aarch64 solaris2-5.11-i386: - solaris2-5.11-i386 solaris2-5.11-sparc: diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml index 7ab1ea33cd..5e0b71bf41 100644 --- a/.expeditor/verify.pipeline.yml +++ b/.expeditor/verify.pipeline.yml @@ -146,7 +146,9 @@ steps: - label: "Integration openSUSE 15 :ruby: 3.1" commands: - /workdir/.expeditor/scripts/bk_container_prep.sh - - zypper addrepo --check --priority 50 --refresh --name "Chefzypper-repo" "https://mirror.fcix.net/opensuse/distribution/leap/15.3/repo/oss/" "chefzypper" + - find /etc/zypp/repos.d -name "SMT-*" -execdir rm -f -- '{}' \; + - zypper addrepo --check --priority 60 --refresh --name "Chefzypper-repo" "https://mirror.fcix.net/opensuse/distribution/leap/15.3/repo/oss/" "chefzypper" + - zypper --gpg-auto-import-keys ref - zypper install -y cron insserv-compat - cd /workdir; bundle config set --local without omnibus_package - bundle config set --local path 'vendor/bundle' @@ -161,7 +163,9 @@ steps: - label: "Functional openSUSE 15 :ruby: 3.1" commands: - /workdir/.expeditor/scripts/bk_container_prep.sh + - find /etc/zypp/repos.d -name "SMT-*" -execdir rm -f -- '{}' \; - zypper addrepo --check --priority 50 --refresh --name "Chefzypper-repo" "https://mirror.fcix.net/opensuse/distribution/leap/15.3/repo/oss/" "chefzypper" + - zypper --gpg-auto-import-keys ref - zypper install -y cronie insserv-compat - zypper install -y libarchive-devel - cd /workdir; bundle config set --local without omnibus_package @@ -177,7 +181,9 @@ steps: - label: "Unit openSUSE 15 :ruby: 3.1" commands: - /workdir/.expeditor/scripts/bk_container_prep.sh + - find /etc/zypp/repos.d -name "SMT-*" -execdir rm -f -- '{}' \; - zypper addrepo --check --priority 50 --refresh --name "Chefzypper-repo" "https://mirror.fcix.net/opensuse/distribution/leap/15.3/repo/oss/" "chefzypper" + - zypper --gpg-auto-import-keys ref - zypper install -y cron insserv-compat libarchive-devel - bundle config set --local without omnibus_package - bundle config set --local path 'vendor/bundle' diff --git a/CHANGELOG.md b/CHANGELOG.md index 6539436ebc..f7c7532b5d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,17 +1,20 @@ <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ --> This changelog lists individual merged pull requests to Chef Infra Client and geared towards developers. For a list of significant changes per release see the [Chef Infra Client Release Notes](https://docs.chef.io/release_notes_client/). -<!-- latest_release 18.0.205 --> -## [v18.0.205](https://github.com/chef/chef/tree/v18.0.205) (2022-12-21) +<!-- latest_release 18.0.208 --> +## [v18.0.208](https://github.com/chef/chef/tree/v18.0.208) (2023-01-03) #### Merged Pull Requests -- Bump test-kitchen from 3.4.0 to 3.5.0 in /omnibus [#13444](https://github.com/chef/chef/pull/13444) ([dependabot[bot]](https://github.com/dependabot[bot])) +- Adds 'makecache_fast' property to `yum_repository` minimise cached repodata [#12915](https://github.com/chef/chef/pull/12915) ([lanky](https://github.com/lanky)) <!-- latest_release --> <!-- release_rollup since=18.0.185 --> ### Changes not yet released to stable #### Merged Pull Requests +- Adds 'makecache_fast' property to `yum_repository` minimise cached repodata [#12915](https://github.com/chef/chef/pull/12915) ([lanky](https://github.com/lanky)) <!-- 18.0.208 --> +- updating file_system to send back the copy status [#13107](https://github.com/chef/chef/pull/13107) ([vinay-satish](https://github.com/vinay-satish)) <!-- 18.0.207 --> +- Bump omnibus from `8314373` to `f7386ad` in /omnibus [#13463](https://github.com/chef/chef/pull/13463) ([dependabot[bot]](https://github.com/dependabot[bot])) <!-- 18.0.206 --> - Bump test-kitchen from 3.4.0 to 3.5.0 in /omnibus [#13444](https://github.com/chef/chef/pull/13444) ([dependabot[bot]](https://github.com/dependabot[bot])) <!-- 18.0.205 --> - Added or Corrected spelling and corrected a Python exception handler … [#13454](https://github.com/chef/chef/pull/13454) ([johnmccrae](https://github.com/johnmccrae)) <!-- 18.0.204 --> - Bump omnibus-software from `a4f5cff` to `2be3816` in /omnibus [#13448](https://github.com/chef/chef/pull/13448) ([dependabot[bot]](https://github.com/dependabot[bot])) <!-- 18.0.203 --> diff --git a/Gemfile.lock b/Gemfile.lock index 538719b378..3dc387743b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -33,7 +33,6 @@ GIT http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - GIT remote: https://github.com/chef/ruby-shadow revision: 3b8ea40b0e943b5de721d956741308ce805a5c3c @@ -51,12 +50,12 @@ GIT PATH remote: . specs: - chef (18.0.205) + chef (18.0.208) addressable aws-sdk-s3 (~> 1.91) aws-sdk-secretsmanager (~> 1.46) - chef-config (= 18.0.205) - chef-utils (= 18.0.205) + chef-config (= 18.0.208) + chef-utils (= 18.0.208) chef-vault chef-zero (>= 14.0.11) corefoundation (~> 0.3.4) @@ -85,13 +84,13 @@ PATH unf_ext (>= 0.0.8.2) uuidtools (>= 2.1.5, < 3.0) vault (~> 0.16) - chef (18.0.205-x64-mingw-ucrt) + chef (18.0.208-x64-mingw-ucrt) addressable aws-sdk-s3 (~> 1.91) aws-sdk-secretsmanager (~> 1.46) - chef-config (= 18.0.205) + chef-config (= 18.0.208) chef-powershell (~> 1.0.12) - chef-utils (= 18.0.205) + chef-utils (= 18.0.208) chef-vault chef-zero (>= 14.0.11) corefoundation (~> 0.3.4) @@ -135,15 +134,15 @@ PATH PATH remote: chef-bin specs: - chef-bin (18.0.205) - chef (= 18.0.205) + chef-bin (18.0.208) + chef (= 18.0.208) PATH remote: chef-config specs: - chef-config (18.0.205) + chef-config (18.0.208) addressable - chef-utils (= 18.0.205) + chef-utils (= 18.0.208) fuzzyurl mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) @@ -152,7 +151,7 @@ PATH PATH remote: chef-utils specs: - chef-utils (18.0.205) + chef-utils (18.0.208) concurrent-ruby GEM @@ -201,7 +200,7 @@ GEM rack (~> 2.0, >= 2.0.6) uuidtools (~> 2.1) webrick - cheffish (17.0.0) + cheffish (17.1.5) chef-utils (>= 17.0) chef-zero (>= 14.0) net-ssh @@ -1 +1 @@ -18.0.205
\ No newline at end of file +18.0.208
\ No newline at end of file diff --git a/chef-bin/lib/chef-bin/version.rb b/chef-bin/lib/chef-bin/version.rb index 79777b2fb2..8ec25c50c8 100644 --- a/chef-bin/lib/chef-bin/version.rb +++ b/chef-bin/lib/chef-bin/version.rb @@ -21,7 +21,7 @@ module ChefBin CHEFBIN_ROOT = File.expand_path("..", __dir__) - VERSION = "18.0.205".freeze + VERSION = "18.0.208".freeze end # diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb index 5c32146771..63cc96d744 100644 --- a/chef-config/lib/chef-config/version.rb +++ b/chef-config/lib/chef-config/version.rb @@ -15,5 +15,5 @@ module ChefConfig CHEFCONFIG_ROOT = File.expand_path("..", __dir__) - VERSION = "18.0.205".freeze + VERSION = "18.0.208".freeze end diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb index d68d8497f8..135cf867c5 100644 --- a/chef-utils/lib/chef-utils/version.rb +++ b/chef-utils/lib/chef-utils/version.rb @@ -16,5 +16,5 @@ module ChefUtils CHEFUTILS_ROOT = File.expand_path("..", __dir__) - VERSION = "18.0.205" + VERSION = "18.0.208" end diff --git a/knife/Gemfile.lock b/knife/Gemfile.lock index 14c6b0a692..20e7e6af74 100644 --- a/knife/Gemfile.lock +++ b/knife/Gemfile.lock @@ -1,8 +1,8 @@ PATH remote: .. specs: - chef (18.0.205) - chef (18.0.205-x64-mingw-ucrt) + chef (18.0.208) + chef (18.0.208-x64-mingw-ucrt) PLATFORMS ruby @@ -15,7 +15,7 @@ DEPENDENCIES chef-config! chef-utils! chef-vault - cheffish (>= 17) + cheffish (>= 17.1.5) chefstyle ed25519 (~> 1.2) fauxhai-ng diff --git a/knife/lib/chef/knife/download.rb b/knife/lib/chef/knife/download.rb index 2eda642979..b7ceb31261 100644 --- a/knife/lib/chef/knife/download.rb +++ b/knife/lib/chef/knife/download.rb @@ -71,7 +71,8 @@ class Chef error = false pattern_args.each do |pattern| - if Chef::ChefFS::FileSystem.copy_to(pattern, chef_fs, local_fs, config[:recurse] ? nil : 1, config, ui, proc { |entry| format_path(entry) }) + fs_error, result = Chef::ChefFS::FileSystem.copy_to(pattern, chef_fs, local_fs, config[:recurse] ? nil : 1, config, ui, proc { |entry| format_path(entry) }) + if fs_error error = true end end diff --git a/knife/lib/chef/knife/upload.rb b/knife/lib/chef/knife/upload.rb index e8dd052e77..17118247cb 100644 --- a/knife/lib/chef/knife/upload.rb +++ b/knife/lib/chef/knife/upload.rb @@ -73,7 +73,8 @@ class Chef error = false pattern_args.each do |pattern| - if Chef::ChefFS::FileSystem.copy_to(pattern, local_fs, chef_fs, config[:recurse] ? nil : 1, config, ui, proc { |entry| format_path(entry) }) + fs_error, result = Chef::ChefFS::FileSystem.copy_to(pattern, local_fs, chef_fs, config[:recurse] ? nil : 1, config, ui, proc { |entry| format_path(entry) }) + if fs_error error = true end end diff --git a/knife/lib/chef/knife/version.rb b/knife/lib/chef/knife/version.rb index 9fe6ba90ab..d4b5b93017 100644 --- a/knife/lib/chef/knife/version.rb +++ b/knife/lib/chef/knife/version.rb @@ -17,7 +17,7 @@ class Chef class Knife KNIFE_ROOT = File.expand_path("../..", __dir__) - VERSION = "18.0.205".freeze + VERSION = "18.0.208".freeze end end diff --git a/lib/chef/chef_fs/file_system.rb b/lib/chef/chef_fs/file_system.rb index 5c4278c100..5c086bc11c 100644 --- a/lib/chef/chef_fs/file_system.rb +++ b/lib/chef/chef_fs/file_system.rb @@ -140,17 +140,18 @@ class Chef def self.copy_to(pattern, src_root, dest_root, recurse_depth, options, ui = nil, format_path = nil) found_result = false error = false + result = {} list_pairs(pattern, src_root, dest_root).parallel_each do |src, dest| found_result = true new_dest_parent = get_or_create_parent(dest, options, ui, format_path) - child_error = copy_entries(src, dest, new_dest_parent, recurse_depth, options, ui, format_path) + child_error, result = copy_entries(src, dest, new_dest_parent, recurse_depth, options, ui, format_path) error ||= child_error end if !found_result && pattern.exact_path ui.error "#{pattern}: No such file or directory on remote or local" if ui error = true end - error + [error, result] end # Yield entries for children that are in either +a_root+ or +b_root+, with @@ -275,6 +276,7 @@ class Chef # case we shouldn't waste time trying PUT if we know the file doesn't # exist. # Will need to decide how that works with checksums, though. + result = { "total" => 0, "success_count" => 0, "failed" => [] } error = false begin dest_path = format_path.call(dest_entry) if ui @@ -290,6 +292,8 @@ class Chef dest_entry.delete(true) ui.output "Deleted extra entry #{dest_path} (purge is on)" if ui rescue Chef::ChefFS::FileSystem::NotFoundError + failure = { "src_path" => src_path, "reason" => "Entry #{dest_path} does not exist" } + result["failed"].append(failure) ui.output "Entry #{dest_path} does not exist. Nothing to do. (purge is on)" if ui end end @@ -323,7 +327,7 @@ class Chef if recurse_depth != 0 src_entry.children.parallel_each do |src_child| new_dest_child = new_dest_dir.child(src_child.name) - child_error = copy_entries(src_child, new_dest_child, new_dest_dir, recurse_depth ? recurse_depth - 1 : recurse_depth, options, ui, format_path) + child_error, result = copy_entries(src_child, new_dest_child, new_dest_dir, recurse_depth ? recurse_depth - 1 : recurse_depth, options, ui, format_path) error ||= child_error end end @@ -339,14 +343,15 @@ class Chef else # Both exist. - # If the entry can do a copy directly, do that. if dest_entry.respond_to?(:copy_from) if options[:force] || compare(src_entry, dest_entry)[0] == false if options[:dry_run] ui.output "Would update #{dest_path}" if ui else + result["total"] += 1 dest_entry.copy_from(src_entry, options) + result["success_count"] += 1 ui.output "Updated #{dest_path}" if ui end end @@ -359,7 +364,7 @@ class Chef # If both are directories, recurse into their children if recurse_depth != 0 child_pairs(src_entry, dest_entry).parallel_each do |src_child, dest_child| - child_error = copy_entries(src_child, dest_child, dest_entry, recurse_depth ? recurse_depth - 1 : recurse_depth, options, ui, format_path) + child_error, result = copy_entries(src_child, dest_child, dest_entry, recurse_depth ? recurse_depth - 1 : recurse_depth, options, ui, format_path) error ||= child_error end end @@ -373,7 +378,6 @@ class Chef ui.error("File #{src_path} is a regular file while file #{dest_path} is a directory\n") if ui return else - # Both are files! Copy them unless we're sure they are the same.' if options[:diff] == false should_copy = false @@ -389,7 +393,9 @@ class Chef ui.output "Would update #{dest_path}" if ui else src_value = src_entry.read if src_value.nil? + result["total"] += 1 dest_entry.write(src_value) + result["success_count"] += 1 ui.output "Updated #{dest_path}" if ui end end @@ -397,17 +403,25 @@ class Chef end end rescue RubyFileError => e + failure = { "src_path" => src_path, "reason" => e.reason } + result["failed"].append(failure) ui.warn "#{format_path.call(e.entry)} #{e.reason}." if ui rescue DefaultEnvironmentCannotBeModifiedError => e + failure = { "src_path" => src_path, "reason" => e.reason } + result["failed"].append(failure) ui.warn "#{format_path.call(e.entry)} #{e.reason}." if ui rescue OperationFailedError => e + failure = { "src_path" => src_path, "reason" => e.reason } + result["failed"].append(failure) ui.error "#{format_path.call(e.entry)} failed to #{e.operation}: #{e.message}" if ui error = true rescue OperationNotAllowedError => e + failure = { "src_path" => src_path, "reason" => e.reason } + result["failed"].append(failure) ui.error "#{format_path.call(e.entry)} #{e.reason}." if ui error = true end - error + [error, result] end def get_or_create_parent(entry, options, ui, format_path) diff --git a/lib/chef/provider/yum_repository.rb b/lib/chef/provider/yum_repository.rb index a3d19e95d3..9b32896733 100644 --- a/lib/chef/provider/yum_repository.rb +++ b/lib/chef/provider/yum_repository.rb @@ -44,7 +44,12 @@ class Chef mode new_resource.mode if new_resource.make_cache notifies :run, "execute[yum clean metadata #{new_resource.repositoryid}]", :immediately if new_resource.clean_metadata || new_resource.clean_headers - notifies :run, "execute[yum-makecache-#{new_resource.repositoryid}]", :immediately + # makecache fast only works on non-dnf systems. + if !which "dnf" && new_resource.makecache_fast + notifies :run, "execute[yum-makecache-fast-#{new_resource.repositoryid}]", :immediately + else + notifies :run, "execute[yum-makecache-#{new_resource.repositoryid}]", :immediately + end notifies :flush_cache, "package[package-cache-reload-#{new_resource.repositoryid}]", :immediately end end @@ -63,6 +68,13 @@ class Chef only_if { new_resource.enabled } end + # download only the minimum required metadata + execute "yum-makecache-fast-#{new_resource.repositoryid}" do + command "yum -q -y makecache fast --disablerepo=* --enablerepo=#{new_resource.repositoryid}" + action :nothing + only_if { new_resource.enabled } + end + package "package-cache-reload-#{new_resource.repositoryid}" do action :nothing end diff --git a/lib/chef/resource/yum_repository.rb b/lib/chef/resource/yum_repository.rb index fcddd8a50f..436734c003 100644 --- a/lib/chef/resource/yum_repository.rb +++ b/lib/chef/resource/yum_repository.rb @@ -114,6 +114,10 @@ class Chef description: "Determines whether package files downloaded by Yum stay in cache directories. By using cached data, you can carry out certain operations without a network connection.", default: true + property :makecache_fast, [TrueClass, FalseClass], + description: "if make_cache is true, uses `yum makecache fast`, which downloads only the minimum amount of data required. Useful over slower connections and when disk space is at a premium.", + default: false + property :max_retries, [String, Integer], description: "Number of times any attempt to retrieve a file should retry before returning an error. Setting this to `0` makes Yum try forever." diff --git a/lib/chef/version.rb b/lib/chef/version.rb index 967745a348..f57f13dad1 100644 --- a/lib/chef/version.rb +++ b/lib/chef/version.rb @@ -23,7 +23,7 @@ require_relative "version_string" class Chef CHEF_ROOT = File.expand_path("..", __dir__) - VERSION = Chef::VersionString.new("18.0.205") + VERSION = Chef::VersionString.new("18.0.208") end # diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index d43d234c61..898cf2fa4f 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -8,7 +8,7 @@ GIT GIT remote: https://github.com/chef/omnibus.git - revision: 831437387f5496c2d9b9ba1e3ba283dd01bda147 + revision: f7386ad375212a406dc11cd4050b10cbd77f7a42 branch: main specs: omnibus (9.0.14) @@ -34,7 +34,7 @@ GEM artifactory (3.0.15) awesome_print (1.9.2) aws-eventstream (1.2.0) - aws-partitions (1.681.0) + aws-partitions (1.684.0) aws-sdk-core (3.168.4) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.651.0) diff --git a/spec/unit/chef_fs/file_system_spec.rb b/spec/unit/chef_fs/file_system_spec.rb index 0d4ae6aa05..91d24c6dea 100644 --- a/spec/unit/chef_fs/file_system_spec.rb +++ b/spec/unit/chef_fs/file_system_spec.rb @@ -145,4 +145,6 @@ describe Chef::ChefFS::FileSystem, ruby: ">= 3.0" do end end end + + # Need to add the test case for copy_to method - not able to do the implimentation with Dir.mktmpdir end diff --git a/spec/unit/resource/yum_repository_spec.rb b/spec/unit/resource/yum_repository_spec.rb index 36d88450d1..0c6e4d5632 100644 --- a/spec/unit/resource/yum_repository_spec.rb +++ b/spec/unit/resource/yum_repository_spec.rb @@ -68,6 +68,10 @@ describe Chef::Resource::YumRepository do expect(resource.make_cache).to eql(true) end + it "makecache_fast property defaults to false" do + expect(resource.makecache_fast).to eql(false) + end + it "mode property defaults to '0644'" do expect(resource.mode).to eql("0644") end |