Skip to content

Commit 68610a9

Browse files
committed
Remove PE testing and dependencies
1 parent a84ee70 commit 68610a9

File tree

4 files changed

+0
-53
lines changed

4 files changed

+0
-53
lines changed

.travis.yml

-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ matrix:
3333
- env: DISTRO=opensuse-42-x64 PUPPET_INSTALL_TYPE=foss
3434
# SLES is a nightmare to acquire and run. Leave here for possible future use.
3535
- env: DISTRO=sles-12-x64
36-
- env: DISTRO=sles-12-x64 PE=true
3736
fast_finish: true
3837
install:
3938
- make

Gemfile

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ puppetversion = ENV['PUPPET_VERSION'] || '~> 3.8.0'
44
gem 'puppet', puppetversion, :require => false
55

66
gem 'beaker', '~> 3.7'
7-
gem 'beaker-pe', '~> 1.8'
87
gem 'beaker-rspec', '~> 6.0'
98
# 0.7.0 breaks 3.8, see https://github.com/puppetlabs/beaker-puppet_install_helper/issues/27
109
gem 'beaker-puppet_install_helper', '0.6.0'

Makefile

-10
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,8 @@ export BEAKER_set
66
# Default to installing agent (version 4.x)
77
PUPPET_INSTALL_TYPE ?= agent
88

9-
# Set Puppet Enterprise defaults
10-
ifeq ($(PUPPET_INSTALL_TYPE), pe)
11-
PUPPET_INSTALL_VERSION ?= 2016.1.2
12-
BEAKER_PE_VER ?= $(PUPPET_INSTALL_VERSION)
13-
export BEAKER_PE_VER
14-
BEAKER_IS_PE := true
15-
export BEAKER_IS_PE
16-
endif
17-
189
# Export potentially set variables for rake/rspec/beaker
1910
export PUPPET_INSTALL_TYPE
20-
export BEAKER_PE_DIR=spec/fixtures/artifacts
2111
export STRICT_VARIABLES=yes
2212

2313
.DEFAULT_GOAL := .vendor

Rakefile

-41
Original file line numberDiff line numberDiff line change
@@ -100,13 +100,6 @@ RSpec::Core::RakeTask.new('beaker:acceptance') do |c|
100100
end
101101
task 'beaker:acceptance' => [:spec_prep, 'artifacts:prep']
102102

103-
if !ENV['BEAKER_IS_PE'].nil? and ENV['BEAKER_IS_PE'] == 'true'
104-
task :beaker => 'artifacts:pe'
105-
task 'beaker:integration' => 'artifacts:pe'
106-
task 'beaker:acceptance' => 'artifacts:pe'
107-
end
108-
109-
# rubocop:disable Metrics/BlockLength
110103
namespace :artifacts do
111104
desc 'Fetch artifacts for tests'
112105
task :prep do
@@ -119,40 +112,6 @@ namespace :artifacts do
119112
)
120113
end
121114

122-
desc 'Retrieve PE archives'
123-
task :pe do
124-
if !ENV['BEAKER_set'].nil?
125-
case ENV['BEAKER_set']
126-
when /centos-(?<release>\d)/
127-
distro = 'el'
128-
version = Regexp.last_match(:release)
129-
arch = 'x86_64'
130-
when /(?<distro>debian)-(?<release>\d)/
131-
distro = Regexp.last_match(:distro)
132-
version = Regexp.last_match(:release)
133-
arch = 'amd64'
134-
when /(?<distro>sles)-(?<release>\d+)/
135-
distro = Regexp.last_match(:distro)
136-
version = Regexp.last_match(:release)
137-
arch = 'x86_64'
138-
when /(?<distro>ubuntu)-server-(?<release>12|14)/
139-
distro = Regexp.last_match(:distro)
140-
version = "#{Regexp.last_match(:release)}.04"
141-
arch = 'amd64'
142-
else
143-
puts "Could not find PE version for #{ENV['BEAKER_set']}"
144-
return
145-
end
146-
pe_ver = ENV['BEAKER_PE_VER']
147-
file = "puppet-enterprise-#{pe_ver}-#{distro}-#{version}-#{arch}.tar.gz"
148-
fetch_archives(
149-
"https://s3.amazonaws.com/pe-builds/released/#{pe_ver}/#{file}" => file
150-
)
151-
else
152-
puts 'No nodeset set, skipping PE artifact retrieval'
153-
end
154-
end
155-
156115
desc 'Purge fetched artifacts'
157116
task :clean do
158117
FileUtils.rm_rf(Dir.glob('spec/fixtures/artifacts/*'))

0 commit comments

Comments
 (0)