Skip to content

Commit

Permalink
Remove PE testing and dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
tylerjl committed Apr 25, 2017
1 parent a84ee70 commit 68610a9
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 53 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ matrix:
- env: DISTRO=opensuse-42-x64 PUPPET_INSTALL_TYPE=foss
# SLES is a nightmare to acquire and run. Leave here for possible future use.
- env: DISTRO=sles-12-x64
- env: DISTRO=sles-12-x64 PE=true
fast_finish: true
install:
- make
Expand Down
1 change: 0 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ puppetversion = ENV['PUPPET_VERSION'] || '~> 3.8.0'
gem 'puppet', puppetversion, :require => false

gem 'beaker', '~> 3.7'
gem 'beaker-pe', '~> 1.8'
gem 'beaker-rspec', '~> 6.0'
# 0.7.0 breaks 3.8, see https://github.com/puppetlabs/beaker-puppet_install_helper/issues/27
gem 'beaker-puppet_install_helper', '0.6.0'
Expand Down
10 changes: 0 additions & 10 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,8 @@ export BEAKER_set
# Default to installing agent (version 4.x)
PUPPET_INSTALL_TYPE ?= agent

# Set Puppet Enterprise defaults
ifeq ($(PUPPET_INSTALL_TYPE), pe)
PUPPET_INSTALL_VERSION ?= 2016.1.2
BEAKER_PE_VER ?= $(PUPPET_INSTALL_VERSION)
export BEAKER_PE_VER
BEAKER_IS_PE := true
export BEAKER_IS_PE
endif

# Export potentially set variables for rake/rspec/beaker
export PUPPET_INSTALL_TYPE
export BEAKER_PE_DIR=spec/fixtures/artifacts
export STRICT_VARIABLES=yes

.DEFAULT_GOAL := .vendor
Expand Down
41 changes: 0 additions & 41 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -100,13 +100,6 @@ RSpec::Core::RakeTask.new('beaker:acceptance') do |c|
end
task 'beaker:acceptance' => [:spec_prep, 'artifacts:prep']

if !ENV['BEAKER_IS_PE'].nil? and ENV['BEAKER_IS_PE'] == 'true'
task :beaker => 'artifacts:pe'
task 'beaker:integration' => 'artifacts:pe'
task 'beaker:acceptance' => 'artifacts:pe'
end

# rubocop:disable Metrics/BlockLength
namespace :artifacts do
desc 'Fetch artifacts for tests'
task :prep do
Expand All @@ -119,40 +112,6 @@ namespace :artifacts do
)
end

desc 'Retrieve PE archives'
task :pe do
if !ENV['BEAKER_set'].nil?
case ENV['BEAKER_set']
when /centos-(?<release>\d)/
distro = 'el'
version = Regexp.last_match(:release)
arch = 'x86_64'
when /(?<distro>debian)-(?<release>\d)/
distro = Regexp.last_match(:distro)
version = Regexp.last_match(:release)
arch = 'amd64'
when /(?<distro>sles)-(?<release>\d+)/
distro = Regexp.last_match(:distro)
version = Regexp.last_match(:release)
arch = 'x86_64'
when /(?<distro>ubuntu)-server-(?<release>12|14)/
distro = Regexp.last_match(:distro)
version = "#{Regexp.last_match(:release)}.04"
arch = 'amd64'
else
puts "Could not find PE version for #{ENV['BEAKER_set']}"
return
end
pe_ver = ENV['BEAKER_PE_VER']
file = "puppet-enterprise-#{pe_ver}-#{distro}-#{version}-#{arch}.tar.gz"
fetch_archives(
"https://s3.amazonaws.com/pe-builds/released/#{pe_ver}/#{file}" => file
)
else
puts 'No nodeset set, skipping PE artifact retrieval'
end
end

desc 'Purge fetched artifacts'
task :clean do
FileUtils.rm_rf(Dir.glob('spec/fixtures/artifacts/*'))
Expand Down

0 comments on commit 68610a9

Please sign in to comment.