diff --git a/acceptance/setup/git/pre-suite/000_EnvSetup.rb b/acceptance/setup/git/pre-suite/000_EnvSetup.rb index e4e5a8bea..d34f72a2a 100644 --- a/acceptance/setup/git/pre-suite/000_EnvSetup.rb +++ b/acceptance/setup/git/pre-suite/000_EnvSetup.rb @@ -1,75 +1,56 @@ test_name "Setup environment" step "Ensure Git and Ruby" require 'puppet/acceptance/install_utils' extend Puppet::Acceptance::InstallUtils require 'puppet/acceptance/git_utils' extend Puppet::Acceptance::GitUtils require 'beaker/dsl/install_utils' extend Beaker::DSL::InstallUtils PACKAGES = { :redhat => [ 'git', 'ruby', 'rubygem-json', ], :debian => [ ['git', 'git-core'], 'ruby', ], :debian_ruby18 => [ 'libjson-ruby', ], :solaris => [ ['git', 'developer/versioning/git'], ['ruby', 'runtime/ruby-18'], # there isn't a package for json, so it is installed later via gems ], :windows => [ 'git', # there isn't a need for json on windows because it is bundled in ruby 1.9 ], } install_packages_on(hosts, PACKAGES, :check_if_exists => true) hosts.each do |host| case host['platform'] when /windows/ - arch = lookup_in_env('WIN32_RUBY_ARCH', 'puppet-win32-ruby', 'x86') - step "#{host} Selected architecture #{arch}" - - step "#{host} Loading git commit-ish to use for Windows Ruby" - version_defs_file = File.join(File.dirname(__FILE__), '../../../../ext/windows/versions.yaml') - raise "Unable to find yaml config at #{version_defs_file}:" if ! File.exist?(version_defs_file) - - begin - require 'yaml' - @version_defs ||= YAML.load_file(version_defs_file) - rescue Exception => e - STDERR.puts "Unable to load yaml from #{version_defs_file}:" - STDERR.puts e - raise - end - - revision = @version_defs['git_dependencies'][arch]['puppet_win32_ruby_sha'] - raise "Could not find #{arch} architecture git revision for puppet-win32-ruby in #{version_defs_file}" if revision.nil? - - step "#{host} Install ruby from git - revision #{revision}" + step "#{host} Install ruby from git" # TODO remove this step once we are installing puppet from msi packages install_from_git(host, "/opt/puppet-git-repos", :name => 'puppet-win32-ruby', :path => build_giturl('puppet-win32-ruby'), - :rev => revision) + :rev => '1.9.3') on host, 'cd /opt/puppet-git-repos/puppet-win32-ruby; cp -r ruby/* /' on host, 'cd /lib; icacls ruby /grant "Everyone:(OI)(CI)(RX)"' on host, 'cd /lib; icacls ruby /reset /T' on host, 'ruby --version' on host, 'cmd /c gem list' when /solaris/ step "#{host} Install json from rubygems" on host, 'gem install json' end end diff --git a/ext/windows/versions.yaml b/ext/windows/versions.yaml deleted file mode 100644 index 17d3408c5..000000000 --- a/ext/windows/versions.yaml +++ /dev/null @@ -1,7 +0,0 @@ -# pin to specific versions of puppet-win32-ruby repository -# these vendored bits are used by packaging and acceptance tests -git_dependencies: - x86: - puppet_win32_ruby_sha: '1.9.3-x86' - x64: - puppet_win32_ruby_sha: '2.0.0-x64'