Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix rake generation for ssh minions. #9395

Merged
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions testsuite/Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -219,11 +219,13 @@ namespace :jenkins do
minions = args[:instances]
minions.each do |minion|
next if minion.include?('proxy') or minion.include?('monitoring')
# WORKAROUND: renaming should be removed once this issue is done https://github.com/SUSE/spacewalk/issues/25591
modified_client = minion.gsub(/ssh_minion$/, 'sshminion')
Rake::Task['jenkins:generate_rake_run_step'].invoke(
'',
File.basename(minion,'.feature'),
File.basename(minion, '.feature'),
'features/build_validation/init_clients',
"run_sets/build_validation/build_validation_init_client_#{minion}.yml"
"run_sets/build_validation/build_validation_init_client_#{modified_client}.yml"
)
Rake::Task['jenkins:generate_rake_run_step'].reenable
end
Expand All @@ -249,11 +251,13 @@ namespace :jenkins do
task :generate_rake_files_add_activation_keys, [:instances] do |_t, args|
minions = args[:instances]
minions.each do |minion|
# WORKAROUND: renaming should be removed once this issue is done https://github.com/SUSE/spacewalk/issues/25591
modified_client = minion.gsub(/ssh_minion$/, 'sshminion')
Rake::Task['jenkins:generate_rake_run_step'].invoke(
'_add_activation_key',
File.basename(minion, '.feature'),
'features/build_validation/add_activation_keys',
"run_sets/build_validation/build_validation_add_activation_key_#{minion}.yml"
"run_sets/build_validation/build_validation_add_activation_key_#{modified_client}.yml"
)
Rake::Task['jenkins:generate_rake_run_step'].reenable
end
Expand All @@ -264,12 +268,14 @@ namespace :jenkins do
minions = args[:instances]
minions.each do |minion|
next if minion.include?('proxy') || minion.include?('monitoring')
# WORKAROUND: renaming should be removed once this issue is done https://github.com/SUSE/spacewalk/issues/25591
modified_client = minion.gsub(/ssh_minion$/, 'sshminion')

Rake::Task['jenkins:generate_rake_run_step'].invoke(
'_smoke_tests',
File.basename(minion, '.feature'),
'features/build_validation/smoke_tests',
"run_sets/build_validation/build_validation_smoke_tests_#{minion}.yml"
"run_sets/build_validation/build_validation_smoke_tests_#{modified_client}.yml"
)
Rake::Task['jenkins:generate_rake_run_step'].reenable
end
Expand Down
Loading