simp-rake-helpers 5.20.0 → 5.21.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +5 -0
- data/Gemfile +1 -1
- data/lib/simp/ci/gitlab.rb +1 -1
- data/lib/simp/componentinfo.rb +2 -2
- data/lib/simp/rake/build/auto.rb +2 -2
- data/lib/simp/rake/build/build.rb +2 -2
- data/lib/simp/rake/build/pkg.rb +2 -2
- data/lib/simp/rake/helpers/version.rb +1 -1
- data/lib/simp/rake/pupmod/helpers.rb +1 -1
- data/spec/acceptance/nodesets/default.yml +4 -7
- data/spec/acceptance/nodesets/default_ruby3_1.yml +4 -7
- metadata +11 -11
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 321387edbe99a15f34c2826cd1c822582f3f7654dd1a4acbd2e96ef0a133215d
|
4
|
+
data.tar.gz: 541e7eb0edca9975c7a0bf8c0b33895413f9fde8b0a400274d0cd41ea5551cee
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 4132a9ac29c5f264162551a8dfcef44bed5a287cca8f5fb18361b020c780b63ed0748a150bc0e2acab9f7384765656f281de553b5b205ca5ad553c5da4db3f7d
|
7
|
+
data.tar.gz: a753b2d3d99eeab967aab912da8448a75ccd025376f6ac5d4e379d19821a79090031236fdf67d819827238903c86e2ffed498f1fcd19627fd89e38eb82fbe56e
|
data/CHANGELOG.md
CHANGED
data/Gemfile
CHANGED
@@ -2,7 +2,7 @@
|
|
2
2
|
#
|
3
3
|
# SIMP_GEM_SERVERS | a space/comma delimited list of rubygem servers
|
4
4
|
# PUPPET_VERSION | specifies the version of the puppet gem to load
|
5
|
-
puppetversion = ENV.key?('PUPPET_VERSION') ? "#{ENV['PUPPET_VERSION']}" : '
|
5
|
+
puppetversion = ENV.key?('PUPPET_VERSION') ? "#{ENV['PUPPET_VERSION']}" : ['>= 7.0.0', '< 9.0.0']
|
6
6
|
gem_sources = ENV.key?('SIMP_GEM_SERVERS') ? ENV['SIMP_GEM_SERVERS'].split(/[, ]+/) : ['https://rubygems.org']
|
7
7
|
|
8
8
|
gem_sources.each { |gem_source| source gem_source }
|
data/lib/simp/ci/gitlab.rb
CHANGED
@@ -80,7 +80,7 @@ class Simp::Ci::Gitlab
|
|
80
80
|
return @gitlab_yaml if @gitlab_yaml
|
81
81
|
|
82
82
|
begin
|
83
|
-
@gitlab_yaml = YAML.
|
83
|
+
@gitlab_yaml = YAML.safe_load(File.read(@gitlab_config_file), filename: @gitlab_config_file, aliases: true)
|
84
84
|
rescue Psych::SyntaxError => e
|
85
85
|
msg = "ERROR: Malformed YAML: #{e.message}"
|
86
86
|
raise LintError.new(msg)
|
data/lib/simp/componentinfo.rb
CHANGED
@@ -85,7 +85,7 @@ class Simp::ComponentInfo
|
|
85
85
|
def initialize(component_dir, latest_version_only = false, verbose = true)
|
86
86
|
@component_dir = component_dir
|
87
87
|
|
88
|
-
if File.
|
88
|
+
if File.exist?(File.join(@component_dir, 'metadata.json'))
|
89
89
|
@type = :module
|
90
90
|
load_module_info(latest_version_only, verbose)
|
91
91
|
else
|
@@ -107,7 +107,7 @@ class Simp::ComponentInfo
|
|
107
107
|
|
108
108
|
|
109
109
|
changelog_file = File.join(component_dir, 'CHANGELOG')
|
110
|
-
unless File.
|
110
|
+
unless File.exist?(changelog_file)
|
111
111
|
fail("ERROR: No CHANGELOG file found in #{component_dir}")
|
112
112
|
end
|
113
113
|
@changelog = parse_changelog(IO.read(changelog_file), latest_version_only, verbose)
|
data/lib/simp/rake/build/auto.rb
CHANGED
@@ -241,7 +241,7 @@ module Simp::Rake::Build
|
|
241
241
|
fail SIMPBuildException, "ERROR: Mixing `SIMP_BUILD_rm_staging_dir=yes` and `SIMP_BUILD_unpack=no` is silly."
|
242
242
|
end
|
243
243
|
|
244
|
-
if File.
|
244
|
+
if File.exist?(output_dir) && !File.directory?(output_dir)
|
245
245
|
fail SIMPBuildException, "ERROR: ISO output dir exists but is not a directory:\n\n" +
|
246
246
|
" '#{output_dir}'\n\n"
|
247
247
|
end
|
@@ -521,7 +521,7 @@ module Simp::Rake::Build
|
|
521
521
|
puts '-'*80
|
522
522
|
|
523
523
|
FileUtils.rm_rf staging_dir, :verbose => verbose
|
524
|
-
elsif File.
|
524
|
+
elsif File.exist? staging_dir
|
525
525
|
warn ''
|
526
526
|
warn '!'*80
|
527
527
|
warn '#### WARNING: staging dir already exists at:'
|
@@ -64,7 +64,7 @@ module Simp::Rake::Build
|
|
64
64
|
|
65
65
|
fail("Could not find directory #{mod}") unless Dir.exist?(mod)
|
66
66
|
|
67
|
-
next unless File.
|
67
|
+
next unless File.exist?(File.join(mod,'Gemfile'))
|
68
68
|
puts "\n#{mod}\n" if verbose
|
69
69
|
Dir.chdir(mod) do
|
70
70
|
if File.exist?('Gemfile.lock')
|
@@ -515,7 +515,7 @@ module Simp::Rake::Build
|
|
515
515
|
|
516
516
|
# Create example packages.yaml
|
517
517
|
packages_yaml_path = File.join(target_dir, 'packages.yaml')
|
518
|
-
unless File.
|
518
|
+
unless File.exist? packages_yaml_path
|
519
519
|
pkg = 'example-package-name'
|
520
520
|
pkg_file = "#{pkg}-1.0.0-1.el#{major_os_ver}.#{args[:arch]}.rpm"
|
521
521
|
yum_url = "https://yum.server/#{args[:os]}/#{major_os_ver}/#{args[:arch]}"
|
data/lib/simp/rake/build/pkg.rb
CHANGED
@@ -602,7 +602,7 @@ module Simp::Rake::Build
|
|
602
602
|
.delete_if{|x| x =~ /\.src\.rpm$/}
|
603
603
|
.each do |path|
|
604
604
|
sym_path = "repos/basetest/#{File.basename(path)}"
|
605
|
-
ln_sf(path,sym_path, :verbose => @verbose) unless File.
|
605
|
+
ln_sf(path,sym_path, :verbose => @verbose) unless File.exist?(sym_path)
|
606
606
|
end
|
607
607
|
|
608
608
|
if args[:aux_dir]
|
@@ -610,7 +610,7 @@ module Simp::Rake::Build
|
|
610
610
|
.delete_if{|x| x =~ /\.src\.rpm$/}
|
611
611
|
.each do |path|
|
612
612
|
sym_path = "repos/lookaside/#{File.basename(path)}"
|
613
|
-
ln_sf(path,sym_path, :verbose => @verbose) unless File.
|
613
|
+
ln_sf(path,sym_path, :verbose => @verbose) unless File.exist?(sym_path)
|
614
614
|
end
|
615
615
|
end
|
616
616
|
|
@@ -107,7 +107,7 @@ class Simp::Rake::Pupmod::Helpers < ::Rake::TaskLib
|
|
107
107
|
def metadata( file_path = nil )
|
108
108
|
require 'json'
|
109
109
|
_file = file_path || File.join(@base_dir, 'metadata.json')
|
110
|
-
fail "ERROR: file not found: '#{_file}'" unless File.
|
110
|
+
fail "ERROR: file not found: '#{_file}'" unless File.exist? _file
|
111
111
|
@metadata ||= JSON.parse( File.read(_file) )
|
112
112
|
end
|
113
113
|
|
@@ -1,3 +1,4 @@
|
|
1
|
+
---
|
1
2
|
HOSTS:
|
2
3
|
el7-build-server:
|
3
4
|
roles:
|
@@ -6,7 +7,7 @@ HOSTS:
|
|
6
7
|
platform: el-7-x86_64
|
7
8
|
hypervisor: docker
|
8
9
|
image: simpproject/simp_build_centos7
|
9
|
-
docker_cmd:
|
10
|
+
docker_cmd: "/usr/sbin/sshd -D -E /var/log/sshd.log"
|
10
11
|
|
11
12
|
el8-build-server:
|
12
13
|
roles:
|
@@ -19,12 +20,8 @@ HOSTS:
|
|
19
20
|
|
20
21
|
CONFIG:
|
21
22
|
log_level: verbose
|
22
|
-
type:
|
23
|
-
|
24
|
-
puppet_collection: <%= ENV['BEAKER_PUPPET_COLLECTION'] %>
|
25
|
-
<% else -%>
|
26
|
-
puppet_collection: puppet6
|
27
|
-
<% end -%>
|
23
|
+
type: aio
|
24
|
+
puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet8') %>"
|
28
25
|
ssh:
|
29
26
|
password: root
|
30
27
|
auth_methods:
|
@@ -1,3 +1,4 @@
|
|
1
|
+
---
|
1
2
|
HOSTS:
|
2
3
|
el7-build-server:
|
3
4
|
roles:
|
@@ -6,7 +7,7 @@ HOSTS:
|
|
6
7
|
platform: el-7-x86_64
|
7
8
|
hypervisor: docker
|
8
9
|
image: simpproject/simp_build_centos7_ruby3_1
|
9
|
-
docker_cmd:
|
10
|
+
docker_cmd: "/usr/sbin/sshd -D -E /var/log/sshd.log"
|
10
11
|
|
11
12
|
el8-build-server:
|
12
13
|
roles:
|
@@ -19,12 +20,8 @@ HOSTS:
|
|
19
20
|
|
20
21
|
CONFIG:
|
21
22
|
log_level: verbose
|
22
|
-
type:
|
23
|
-
|
24
|
-
puppet_collection: <%= ENV['BEAKER_PUPPET_COLLECTION'] %>
|
25
|
-
<% else -%>
|
26
|
-
puppet_collection: puppet6
|
27
|
-
<% end -%>
|
23
|
+
type: aio
|
24
|
+
puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet8') %>"
|
28
25
|
ssh:
|
29
26
|
password: root
|
30
27
|
auth_methods:
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: simp-rake-helpers
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 5.
|
4
|
+
version: 5.21.0
|
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: 2023-
|
12
|
+
date: 2023-08-24 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: simp-beaker-helpers
|
@@ -54,7 +54,7 @@ dependencies:
|
|
54
54
|
version: '10.0'
|
55
55
|
- - "<"
|
56
56
|
- !ruby/object:Gem::Version
|
57
|
-
version: '
|
57
|
+
version: '14.0'
|
58
58
|
type: :runtime
|
59
59
|
prerelease: false
|
60
60
|
version_requirements: !ruby/object:Gem::Requirement
|
@@ -64,7 +64,7 @@ dependencies:
|
|
64
64
|
version: '10.0'
|
65
65
|
- - "<"
|
66
66
|
- !ruby/object:Gem::Version
|
67
|
-
version: '
|
67
|
+
version: '14.0'
|
68
68
|
- !ruby/object:Gem::Dependency
|
69
69
|
name: puppet
|
70
70
|
requirement: !ruby/object:Gem::Requirement
|
@@ -114,7 +114,7 @@ dependencies:
|
|
114
114
|
version: '1.0'
|
115
115
|
- - "<"
|
116
116
|
- !ruby/object:Gem::Version
|
117
|
-
version: '
|
117
|
+
version: '3.0'
|
118
118
|
type: :runtime
|
119
119
|
prerelease: false
|
120
120
|
version_requirements: !ruby/object:Gem::Requirement
|
@@ -124,7 +124,7 @@ dependencies:
|
|
124
124
|
version: '1.0'
|
125
125
|
- - "<"
|
126
126
|
- !ruby/object:Gem::Version
|
127
|
-
version: '
|
127
|
+
version: '3.0'
|
128
128
|
- !ruby/object:Gem::Dependency
|
129
129
|
name: puppet-lint-params_empty_string-check
|
130
130
|
requirement: !ruby/object:Gem::Requirement
|
@@ -242,7 +242,7 @@ dependencies:
|
|
242
242
|
version: '2.4'
|
243
243
|
- - "<"
|
244
244
|
- !ruby/object:Gem::Version
|
245
|
-
version: '
|
245
|
+
version: '5.0'
|
246
246
|
type: :runtime
|
247
247
|
prerelease: false
|
248
248
|
version_requirements: !ruby/object:Gem::Requirement
|
@@ -252,7 +252,7 @@ dependencies:
|
|
252
252
|
version: '2.4'
|
253
253
|
- - "<"
|
254
254
|
- !ruby/object:Gem::Version
|
255
|
-
version: '
|
255
|
+
version: '5.0'
|
256
256
|
- !ruby/object:Gem::Dependency
|
257
257
|
name: r10k
|
258
258
|
requirement: !ruby/object:Gem::Requirement
|
@@ -262,7 +262,7 @@ dependencies:
|
|
262
262
|
version: '2.2'
|
263
263
|
- - "<"
|
264
264
|
- !ruby/object:Gem::Version
|
265
|
-
version: '
|
265
|
+
version: '5.0'
|
266
266
|
type: :runtime
|
267
267
|
prerelease: false
|
268
268
|
version_requirements: !ruby/object:Gem::Requirement
|
@@ -272,7 +272,7 @@ dependencies:
|
|
272
272
|
version: '2.2'
|
273
273
|
- - "<"
|
274
274
|
- !ruby/object:Gem::Version
|
275
|
-
version: '
|
275
|
+
version: '5.0'
|
276
276
|
- !ruby/object:Gem::Dependency
|
277
277
|
name: pager
|
278
278
|
requirement: !ruby/object:Gem::Requirement
|
@@ -643,7 +643,7 @@ homepage: https://github.com/simp/rubygem-simp-rake-helpers
|
|
643
643
|
licenses:
|
644
644
|
- Apache-2.0
|
645
645
|
metadata:
|
646
|
-
issue_tracker: https://simp-
|
646
|
+
issue_tracker: https://github.com/simp/rubygem-simp-rake-helpers/issues
|
647
647
|
post_install_message:
|
648
648
|
rdoc_options: []
|
649
649
|
require_paths:
|