Skip to content

Commit 499534b

Browse files
author
David Swan
committed
(FM-8199) - Port module to Litmus
- Litmus module temporarily pinned on branch while it waits for merge
1 parent 50d5a1c commit 499534b

29 files changed

+542
-869
lines changed

.fixtures.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
fixtures:
22
repositories:
3-
"stdlib": "https://github.com/puppetlabs/puppetlabs-stdlib.git"
3+
facts: 'https://github.com/puppetlabs/puppetlabs-facts.git'
4+
puppet_agent: 'https://github.com/puppetlabs/puppetlabs-puppet_agent.git'
5+
provision: 'https://github.com/puppetlabs/provision.git'
6+
stdlib: 'https://github.com/puppetlabs/puppetlabs-stdlib.git'
47
symlinks:
58
sqlserver: "#{source_dir}"

.sync.yml

-14
Original file line numberDiff line numberDiff line change
@@ -26,20 +26,6 @@ appveyor.yml:
2626
CHECK: parallel_spec
2727
simplecov: true
2828
Gemfile:
29-
required:
30-
":system_tests":
31-
- gem: puppet-module-posix-system-r#{minor_version}
32-
platforms: ruby
33-
- gem: puppet-module-win-system-r#{minor_version}
34-
platforms:
35-
- mswin
36-
- mingw
37-
- x64_mingw
38-
- gem: beaker-testmode_switcher
39-
version: "~> 0.4"
40-
- gem: master_manipulator
41-
- gem: puppet-blacksmith
42-
version: "~> 3.4"
4329
optional:
4430
":development":
4531
- gem: ruby-pwsh

Gemfile

+2-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
source ENV['GEM_SOURCE'] || 'https://rubygems.org'
22

3+
gem "puppet_litmus", git: "https://github.com/david22swan/puppet_litmus", require: false, branch: "feature_add", platforms: [:ruby, :mswin, :mingw, :x64_mingw] if ENV['PUPPET_GEM_VERSION'].nil? or ENV['PUPPET_GEM_VERSION'] !~ %r{ 5}
4+
35
def location_for(place_or_version, fake_version = nil)
46
git_url_regex = %r{\A(?<url>(https?|git)[:@][^#]*)(#(?<branch>.*))?}
57
file_url_regex = %r{\Afile:\/\/(?<path>.*)}
@@ -31,13 +33,6 @@ group :development do
3133
gem "ruby-pwsh", require: false
3234
gem "github_changelog_generator", require: false, git: 'https://github.com/skywinder/github-changelog-generator', ref: '20ee04ba1234e9e83eb2ffb5056e23d641c7a018' if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')
3335
end
34-
group :system_tests do
35-
gem "puppet-module-posix-system-r#{minor_version}", require: false, platforms: [:ruby]
36-
gem "puppet-module-win-system-r#{minor_version}", require: false, platforms: [:mswin, :mingw, :x64_mingw]
37-
gem "beaker-testmode_switcher", '~> 0.4', require: false
38-
gem "master_manipulator", require: false
39-
gem "puppet-blacksmith", '~> 3.4', require: false
40-
end
4136

4237
puppet_version = ENV['PUPPET_GEM_VERSION']
4338
facter_version = ENV['FACTER_GEM_VERSION']

metadata.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,5 +49,5 @@
4949
],
5050
"pdk-version": "1.15.0",
5151
"template-url": "https://github.com/puppetlabs/pdk-templates#master",
52-
"template-ref": "heads/master-0-g941e819"
52+
"template-ref": "heads/master-0-g5676b3f"
5353
}

provision.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
default:
2+
provisioner: vagrant
3+
images: ['gusztavvargadr/windows-server']
4+
release_checks:
5+
provisioner: vmpooler
6+
images: ['win-2008r2-x86_64', 'win-2012r2-x86_64', 'win-2016-core-x86_64', 'win-2019-core-x86_64']

spec/acceptance/nodesets/centos-7-x64.yml

-10
This file was deleted.

spec/acceptance/nodesets/debian-8-x64.yml

-10
This file was deleted.

spec/acceptance/nodesets/default.yml

-18
This file was deleted.

spec/acceptance/nodesets/docker/centos-7.yml

-12
This file was deleted.

spec/acceptance/nodesets/docker/debian-8.yml

-11
This file was deleted.

spec/acceptance/nodesets/docker/ubuntu-14.04.yml

-12
This file was deleted.

spec/acceptance/nodesets/win_2012_sql2012.yml

-24
This file was deleted.

spec/acceptance/nodesets/win_2012_sql2012_future.yml

-27
This file was deleted.

spec/acceptance/nodesets/win_2012_sql2014.yml

-24
This file was deleted.

spec/acceptance/nodesets/win_2012_sql2014_future.yml

-27
This file was deleted.

spec/acceptance/nodesets/win_2012r2_sql2012.yml

-24
This file was deleted.

spec/acceptance/nodesets/win_2012r2_sql2012_future.yml

-27
This file was deleted.

spec/acceptance/nodesets/win_2012r2_sql2014.yml

-24
This file was deleted.

spec/acceptance/nodesets/win_2012r2_sql2014_future.yml

-27
This file was deleted.

0 commit comments

Comments
 (0)