Skip to content

Commit 2bebd01

Browse files
committed
Remove unsupported integration testing
1 parent 41302c6 commit 2bebd01

File tree

9 files changed

+1
-268
lines changed

9 files changed

+1
-268
lines changed

.fixtures.yml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,7 @@ fixtures:
44
facts: 'https://github.com/puppetlabs/puppetlabs-facts.git'
55
"stdlib": "https://github.com/puppetlabs/puppetlabs-stdlib.git"
66
provision: "https://github.com/puppetlabs/provision.git"
7-
puppet_agent:
8-
repo: 'https://github.com/puppetlabs/puppetlabs-puppet_agent.git'
9-
package: "https://github.com/puppetlabs/puppetlabs-package.git"
10-
deploy_pe: "https://github.com/jarretlavallee/puppet-deploy_pe"
11-
sign_cert: "https://github.com/m0dular/sign_cert"
12-
ruby_task_helper: "https://[email protected]/puppetlabs/puppetlabs-ruby_task_helper"
13-
bootstrap: "https://github.com/puppetlabs/puppetlabs-bootstrap"
14-
puppet_conf: "https://github.com/puppetlabs/puppetlabs-puppet_conf"
7+
puppet_agent: "https://github.com/puppetlabs/puppetlabs-puppet_agent.git"
158
symlinks:
169
"ntp": "#{source_dir}"
1710
"my_ntp": "#{source_dir}/spec/fixtures/my_ntp"

.github/workflows/integration_test.yml

Lines changed: 0 additions & 107 deletions
This file was deleted.

.sync.yml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,6 @@ Gemfile:
1313
version: '= 1.15.2'
1414
Rakefile:
1515
changelog_user: puppetlabs
16-
extras:
17-
- |
18-
require 'rspec/core/rake_task'
19-
namespace :ntp do
20-
RSpec::Core::RakeTask.new(:integration) do |t|
21-
t.pattern = 'spec/acceptance/**{,/*/**}/*_spec.rb'
22-
t.rspec_opts = "--tag integration"
23-
end
24-
end
2516
spec/spec_helper.rb:
2617
mock_with: ":rspec"
2718
coverage_report: true

Rakefile

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,3 @@ PuppetLint.configuration.send('disable_documentation')
1515
PuppetLint.configuration.send('disable_single_quote_string_with_variables')
1616
PuppetLint.configuration.fail_on_warnings = true
1717
PuppetLint.configuration.ignore_paths = [".vendor/**/*.pp", ".bundle/**/*.pp", "pkg/**/*.pp", "spec/**/*.pp", "tests/**/*.pp", "types/**/*.pp", "vendor/**/*.pp"]
18-
19-
require 'rspec/core/rake_task'
20-
namespace :ntp do
21-
RSpec::Core::RakeTask.new(:integration) do |t|
22-
t.pattern = 'spec/acceptance/**{,/*/**}/*_spec.rb'
23-
t.rspec_opts = "--tag integration"
24-
end
25-
end
26-

plans/acceptance/pe_agent.pp

Lines changed: 0 additions & 18 deletions
This file was deleted.

plans/acceptance/pe_server.pp

Lines changed: 0 additions & 21 deletions
This file was deleted.

plans/acceptance/provision_integration.pp

Lines changed: 0 additions & 14 deletions
This file was deleted.

spec/acceptance/integration_ntp_spec.rb

Lines changed: 0 additions & 53 deletions
This file was deleted.

spec/spec_helper_acceptance_local.rb

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -3,32 +3,3 @@
33
include PuppetLitmus
44

55
UNSUPPORTED_PLATFORMS = ['windows', 'darwin'].freeze
6-
7-
def inventory_hash
8-
@inventory_hash ||= inventory_hash_from_inventory_file
9-
end
10-
11-
def target_roles(roles)
12-
inventory_hash['groups'].map { |group|
13-
group['targets'].filter_map do |node|
14-
{ name: node['uri'], role: node['vars']['role'] } if roles.include? node['vars']['role']
15-
end
16-
}.flatten
17-
end
18-
19-
RSpec.configure do |config|
20-
if config.filter.rules.key? :integration
21-
ENV['TARGET_HOST'] = target_roles('ntpserver')[0][:name]
22-
else
23-
config.filter_run_excluding :integration
24-
end
25-
end
26-
27-
def change_target_host(role)
28-
@orig_target_host = ENV.fetch('TARGET_HOST', nil)
29-
ENV['TARGET_HOST'] = target_roles(role)[0][:name]
30-
end
31-
32-
def reset_target_host
33-
ENV['TARGET_HOST'] = @orig_target_host
34-
end

0 commit comments

Comments
 (0)