simp-beaker-helpers 1.19.0 → 1.19.1

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 658d1ab2cfb6ff32a020283a3a754fd3d8d4eb50cc73b73286422ea5178d48d3
4
- data.tar.gz: b6a7d451700d8ac207905a20014c405f2aa06731f281720dec6a49cae5d34d33
3
+ metadata.gz: de616faf054a99c350f9a6241296669ce630fff0d6d622fd60c9a36ea2e2a036
4
+ data.tar.gz: cdbc0d01a23a79472998e87ccbd850e5a32f4e56aa04b623c1b05c050254df92
5
5
  SHA512:
6
- metadata.gz: 13d63f19f099f8ca503d447cf41d150c3d74710c9ceca8a1b7c8dad655d783bd534cc117dc326235b6eb4e7ef6306b1ba6864df0c8add83eaad1737d48cdbf38
7
- data.tar.gz: fe95f26b05dfaeff5be470af3c79d3cb3d7a5fc82ac7dde590f5770647d8b058774cfbc8691a00c3323c4ad85608cac7085b0764f4293e68daec6a6889669af4
6
+ metadata.gz: 9539f40a2fbf685e6d3a4763a69aaf5670d80e73a695eab4c029d294523612e847ca16132119a459d4381508e267642065c9f7ff99198ddabe8e4008562d7674
7
+ data.tar.gz: b6ed70ae00c28cfe70705cc704df6206318734ae941ef5848751caa8a37506a1e6a4432fd324a7752aae5dfdcd5fc38baa0e029ae3e17fd5cb6094649432b29e
@@ -0,0 +1,8 @@
1
+ ---
2
+ fixtures:
3
+ repositories:
4
+ fips: https://github.com/simp/pupmod-simp-fips
5
+ augeasproviders_core: https://github.com/simp/augeasproviders_core
6
+ augeasproviders_grub: https://github.com/simp/augeasproviders_grub
7
+ simplib: https://github.com/simp/pupmod-simp-simplib
8
+ stdlib: https://github.com/simp/puppetlabs-stdlib
@@ -1,3 +1,10 @@
1
+ ### 1.19.1 / 2020-12-02
2
+ * Fixed:
3
+ * Bumped the core puppet version to 6.X
4
+ * Fixed the file_content_on method
5
+ * Removed EL 6 support from the tests since the core repos are defunct
6
+ * Started removing some of the puppet 4 tests
7
+
1
8
  ### 1.19.0 / 2020-09-30
2
9
  * Fixed:
3
10
  * rsync handling has a better check to see if rsync actually works prior to
data/Gemfile CHANGED
@@ -44,7 +44,7 @@ group :system_tests do
44
44
  gem 'beaker-rspec'
45
45
  gem 'beaker-windows'
46
46
  gem 'net-ssh'
47
- gem 'puppet', ENV.fetch('PUPPET_VERSION', '~> 5.0')
47
+ gem 'puppet', ENV.fetch('PUPPET_VERSION', '~> 6.0')
48
48
  gem 'puppetlabs_spec_helper'
49
49
  gem 'rubocop'
50
50
  gem 'rubocop-rspec'
@@ -886,10 +886,10 @@ done
886
886
  file_content = nil
887
887
 
888
888
  if file_exists_on(sut, path)
889
- Dir.mktempdir do |dir|
890
- scp_from(host, path, dir)
889
+ Dir.mktmpdir do |dir|
890
+ scp_from(sut, path, dir)
891
891
 
892
- file_content = File.read(File.basename(path))
892
+ file_content = File.read(File.join(dir,File.basename(path)))
893
893
  end
894
894
  end
895
895
 
@@ -1244,7 +1244,10 @@ done
1244
1244
  # NOTE: This --enablerepo enables the repos for listing and is inherited
1245
1245
  # from YUM. This does not actually "enable" the repos, that would require
1246
1246
  # the "--enable" option (from yum-config-manager) :-D.
1247
- available_repos = on(sut, %{yum-config-manager --enablerepo="*"}).stdout.lines.grep(/\A\[(.+)\]\Z/){|x| $1}
1247
+ #
1248
+ # Note: Certain versions of EL8 do not dump by default and EL7 does not
1249
+ # have the '--dump' option.
1250
+ available_repos = on(sut, %{yum-config-manager --enablerepo="*" || yum-config-manager --enablerepo="*" --dump}).stdout.lines.grep(/\A\[(.+)\]\Z/){|x| $1}
1248
1251
 
1249
1252
  invalid_repos = (to_disable - available_repos)
1250
1253
 
@@ -5,7 +5,7 @@ module Simp::BeakerHelpers
5
5
  #
6
6
  # This is done so that we know if some new thing that we're using breaks the
7
7
  # oldest system that we support
8
- DEFAULT_PUPPET_AGENT_VERSION = '~> 5.0'
8
+ DEFAULT_PUPPET_AGENT_VERSION = '~> 6.0'
9
9
 
10
10
  SSG_REPO_URL = ENV['BEAKER_ssg_repo'] || 'https://github.com/ComplianceAsCode/content.git'
11
11
 
@@ -1,5 +1,5 @@
1
1
  module Simp; end
2
2
 
3
3
  module Simp::BeakerHelpers
4
- VERSION = '1.19.0'
4
+ VERSION = '1.19.1'
5
5
  end
@@ -16,13 +16,6 @@ HOSTS:
16
16
  box: centos/7
17
17
  hypervisor: <%= hypervisor %>
18
18
 
19
- server-el6:
20
- roles:
21
- - el6
22
- platform: el-6-x86_64
23
- box: centos/6
24
- hypervisor: <%= hypervisor %>
25
-
26
19
  server-el8:
27
20
  roles:
28
21
  - el8
@@ -14,8 +14,8 @@ hosts.each do |host|
14
14
  expect(client_puppet_version.split('.').first).to eq(puppet_collection_version)
15
15
  end
16
16
  else
17
- it 'should not be running puppet 5' do
18
- expect(client_puppet_version.split('.').first).to eq '5'
17
+ it 'should be running puppet 6' do
18
+ expect(client_puppet_version.split('.').first).to eq '6'
19
19
  end
20
20
  end
21
21
  end
@@ -103,21 +103,11 @@ describe 'Simp::BeakerHelpers' do
103
103
  end
104
104
 
105
105
  it 'uses defaults when no environment variables are set' do
106
- expect( @helper.get_puppet_install_info[:puppet_install_version] ).to match(/^5\./)
107
- expect( @helper.get_puppet_install_info[:puppet_collection] ).to eq('puppet5')
106
+ expect( @helper.get_puppet_install_info[:puppet_install_version] ).to match(/^6\./)
107
+ expect( @helper.get_puppet_install_info[:puppet_collection] ).to eq('puppet6')
108
108
  expect( @helper.get_puppet_install_info[:puppet_install_type] ).to eq('agent')
109
109
  end
110
110
 
111
- it 'extracts info from PUPPET_INSTALL_VERSION for Puppet 4' do
112
- ENV['PUPPET_INSTALL_VERSION']= '4.10.5'
113
- expected = {
114
- :puppet_install_version => '1.10.5',
115
- :puppet_collection => nil,
116
- :puppet_install_type => 'agent'
117
- }
118
- expect( @helper.get_puppet_install_info ).to eq expected
119
- end
120
-
121
111
  it 'extracts info from PUPPET_INSTALL_VERSION for Puppet 5' do
122
112
  allow(@helper).to receive(:`).with('gem search -ra -e puppet').and_return(gem_search_results)
123
113
  ENV['PUPPET_INSTALL_VERSION']= '5.5.0'
@@ -153,26 +143,6 @@ describe 'Simp::BeakerHelpers' do
153
143
  expect( @helper.get_puppet_install_info ).to eq expected
154
144
  end
155
145
 
156
- it 'extracts info from BEAKER_PUPPET_AGENT_VERSION' do
157
- ENV['BEAKER_PUPPET_AGENT_VERSION']= '4.10.5'
158
- expected = {
159
- :puppet_install_version => '1.10.5',
160
- :puppet_collection => nil,
161
- :puppet_install_type => 'agent'
162
- }
163
- expect( @helper.get_puppet_install_info ).to eq expected
164
- end
165
-
166
- it 'extracts info from PUPPET_VERSION' do
167
- ENV['PUPPET_VERSION']= '4.10.5'
168
- expected = {
169
- :puppet_install_version => '1.10.5',
170
- :puppet_collection => nil,
171
- :puppet_install_type => 'agent'
172
- }
173
- expect( @helper.get_puppet_install_info ).to eq expected
174
- end
175
-
176
146
  it 'extracts info from BEAKER_PUPPET_COLLECTION' do
177
147
  allow(@helper).to receive(:`).with('gem search -ra -e puppet').and_return(gem_search_results)
178
148
  ENV['BEAKER_PUPPET_COLLECTION']= 'puppet5'
@@ -198,9 +168,9 @@ describe 'Simp::BeakerHelpers' do
198
168
  it 'extracts info from PUPPET_INSTALL_TYPE' do
199
169
  ENV['PUPPET_INSTALL_TYPE'] = 'pe'
200
170
 
201
- expect( @helper.get_puppet_install_info[:puppet_collection] ).to eq('puppet5')
171
+ expect( @helper.get_puppet_install_info[:puppet_collection] ).to eq('puppet6')
202
172
  expect( @helper.get_puppet_install_info[:puppet_install_type] ).to eq('pe')
203
- expect( @helper.get_puppet_install_info[:puppet_install_version] ).to match(/^5\./)
173
+ expect( @helper.get_puppet_install_info[:puppet_install_version] ).to match(/^6\./)
204
174
  end
205
175
 
206
176
  it 'fails when BEAKER_PUPPET_COLLECTION is invalid' do
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: simp-beaker-helpers
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.19.0
4
+ version: 1.19.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2020-10-01 00:00:00.000000000 Z
12
+ date: 2020-12-10 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: beaker
@@ -161,6 +161,7 @@ executables: []
161
161
  extensions: []
162
162
  extra_rdoc_files: []
163
163
  files:
164
+ - ".fips_fixtures"
164
165
  - ".fixtures.yml"
165
166
  - ".gitignore"
166
167
  - ".gitlab-ci.yml"