Please review pull request #132: (maint) add gunzip for solaris opened by (justinstoller)
Description:
previously we were using tar xf, we need to add gunzip for solaris/el4
- Opened: Thu Feb 02 21:59:42 UTC 2012
- Based on: puppetlabs:pe2.0.x (e418c07646e264de0aa5a16213960f4412cd112a)
- Requested merge: justinstoller:ci_upgrade_12 (cb4dca12d5939d79efe2afd791cf105ca82ee899)
Diff follows:
diff --git a/setup/pe_upgrade/04_PE-UpgradePuppet.rb b/setup/pe_upgrade/04_PE-UpgradePuppet.rb
index 5dfdf3e..b2c5479 100755
--- a/setup/pe_upgrade/04_PE-UpgradePuppet.rb
+++ b/setup/pe_upgrade/04_PE-UpgradePuppet.rb
@@ -7,19 +7,20 @@
platform = host['platform']
# determine the distro tar name
- dist_tar = "puppet-enterprise-#{version}-#{platform}.tar.gz"
- unless File.file? "/opt/enterprise/dists/#{dist_tar}"
- Log.error "PE #{dist_tar} not found, help!"
+ dist_tar = "puppet-enterprise-#{version}-#{platform}.tar"
+ dist_gz = "#{dist_tar}.gz"
+ unless File.file? "/opt/enterprise/dists/#{dist_gz}"
+ Log.error "PE #{dist_gz} not found, help!"
Log.error ""
Log.error "Make sure your configuration file uses the PE version string:"
Log.error " eg: rhel-5-x86_64 centos-5-x86_64"
- fail_test "Sorry, PE #{dist_tar} file not found."
+ fail_test "Sorry, PE #{dist_gz} file not found."
end
step "Pre Test Setup -- SCP install package to hosts"
- scp_to host, "/opt/enterprise/dists/#{dist_tar}", "/tmp"
+ scp_to host, "/opt/enterprise/dists/#{dist_gz}", "/tmp"
step "Pre Test Setup -- Untar install package on hosts"
- on host,"cd /tmp && tar xf #{dist_tar}"
+ on host,"cd /tmp && gunzip #{dist_gz} && tar xf #{dist_tar}"
end
# Upgrade Master first
-- You received this message because you are subscribed to the Google Groups "Puppet Developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to [email protected].
For more options, visit this group at http://groups.google.com/group/puppet-dev?hl=en.
