summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn McCrae <jmccrae@chf.io>2022-05-08 11:34:49 +0600
committerJohn McCrae <jmccrae@chf.io>2022-05-08 11:34:49 +0600
commit07bfa2c7d4b63fbbd797cbc3e25e7ad4b5eae7e5 (patch)
tree47244d6b270247aef36a3ab10a3dfec2462d2c9e
parenta4a12211777bfedd2fc7247b66cb43ad7932fca0 (diff)
downloadchef-07bfa2c7d4b63fbbd797cbc3e25e7ad4b5eae7e5.tar.gz
Updated the recipe to remove Git completely before updating it.
Signed-off-by: John McCrae <jmccrae@chf.io>
-rw-r--r--kitchen-tests/cookbooks/end_to_end/recipes/macos.rb9
1 files changed, 9 insertions, 0 deletions
diff --git a/kitchen-tests/cookbooks/end_to_end/recipes/macos.rb b/kitchen-tests/cookbooks/end_to_end/recipes/macos.rb
index c31ebc88a3..77f2ff4a9d 100644
--- a/kitchen-tests/cookbooks/end_to_end/recipes/macos.rb
+++ b/kitchen-tests/cookbooks/end_to_end/recipes/macos.rb
@@ -66,6 +66,13 @@ chef_client_launchd "Every 30 mins Infra Client run" do
action :enable
end
+### Begin MacOS nonsense
+# What you see below here is a pile of crazy.
+# The End-To-End recipe wants to update git on MacOS to the latest version.
+# MacOS doesn't like this. We get back symlink update errors et al
+# We then have to use this crazy to take control of enough of the OS
+# to update git without actually hurting anything. UGH
+
user "tempadmin" do
gid 80
shell "/bin/zsh"
@@ -122,6 +129,8 @@ user "tempadmin" do
action :remove
end
+### End MacOS nonsense
+
include_recipe "git"
# test various archive formats in the archive_file resource