Skip to content

Commit d8f1389

Browse files
committed
parallel_spec_standalone: use --format progress
For the past decade, people used a .rspec_parallel to configure this. We can set it directly in the rake task. That enables us to remove the .rspec_parallel and ultimately reduces the number of files required for pdk update/modulesync.
1 parent e7173ab commit d8f1389

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

lib/puppetlabs_spec_helper/rake_tasks.rb

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,13 @@
111111
warn 'No files for parallel_spec to run against'
112112
else
113113

114-
args = ['-t', 'rspec']
115-
args.push('--').concat(ENV['CI_SPEC_OPTIONS'].strip.split).push('--') unless ENV['CI_SPEC_OPTIONS'].nil? || ENV['CI_SPEC_OPTIONS'].strip.empty?
114+
args = ['--type', 'rspec']
115+
additional_options = if ENV['CI_SPEC_OPTIONS'].nil? || ENV['CI_SPEC_OPTIONS'].strip.empty?
116+
['--format', 'progress']
117+
else
118+
ENV['CI_SPEC_OPTIONS'].strip.split + ['--format', 'progress']
119+
end
120+
args.push('--').concat(additional_options).push('--')
116121
args.concat(Rake::FileList[pattern].to_a)
117122

118123
ParallelTests::CLI.new.run(args)

0 commit comments

Comments
 (0)