Merge branch 'main' into fix_install_snaps_call

2 files changed, 13 insertions, 15 deletions

diff --git a/kitchen-tests/cookbooks/end_to_end/recipes/_dmg_package.rb b/kitchen-tests/cookbooks/end_to_end/recipes/_dmg_package.rb
index 27dad15c80..d51ccdc681 100644
--- a/kitchen-tests/cookbooks/end_to_end/recipes/_dmg_package.rb
+++ b/kitchen-tests/cookbooks/end_to_end/recipes/_dmg_package.rb
@@ -11,11 +11,11 @@ dmg_package "LittleSecrets" do
   action   :install
 end
 
-dmg_package "virtualbox" do
-  app "virtualbox"
-  source "http://download.virtualbox.org/virtualbox/6.1.8/VirtualBox-6.1.8-137981-OSX.dmg"
-  checksum "569e91eb3c7cb002d407b236a7aa71ac610cf2ad1afa03730dab11fbd4b89e7c"
-  type "pkg"
-  accept_eula true
-  allow_untrusted true
-end
+# dmg_package "virtualbox" do
+#   app "virtualbox"
+#   source "http://download.virtualbox.org/virtualbox/6.1.8/VirtualBox-6.1.8-137981-OSX.dmg"
+#   checksum "569e91eb3c7cb002d407b236a7aa71ac610cf2ad1afa03730dab11fbd4b89e7c"
+#   type "pkg"
+#   accept_eula true
+#   allow_untrusted true
+# end
diff --git a/kitchen-tests/cookbooks/end_to_end/recipes/linux.rb b/kitchen-tests/cookbooks/end_to_end/recipes/linux.rb
index 4968c26d32..a1b621ec13 100644
--- a/kitchen-tests/cookbooks/end_to_end/recipes/linux.rb
+++ b/kitchen-tests/cookbooks/end_to_end/recipes/linux.rb
@@ -44,13 +44,11 @@ include_recipe "::_chef_gem"
 
 include_recipe "ntp" unless fedora? # fedora 34+ doesn't have NTP
 
-# FIXME linux docker images seem to produce
-# EBUSY errors on moving or writing to /etc/resolv.conf
-#
-# resolver_config "/etc/resolv.conf" do
-#   nameservers [ "8.8.8.8", "8.8.4.4" ]
-#   search [ "chef.io" ]
-# end
+resolver_config "/etc/resolv.conf" do
+  nameservers [ "8.8.8.8", "8.8.4.4" ]
+  search [ "chef.io" ]
+  atomic_update false # otherwise EBUSY for linux docker containers
+end
 
 users_from_databag = search("users", "*:*")