Specify option for with or without flushing When I create the bootstr…

…ap repositories
uyuni-project · Jun 19, 2024 · bb06a2e · bb06a2e
1 parent 8805b4e
commit bb06a2e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/.../build_validation/create_bootstrap_repositories/srv_create_bootstrap_repositories.feature b/.../build_validation/create_bootstrap_repositories/srv_create_bootstrap_repositories.feature
@@ -132,4 +132,4 @@ Feature: Create bootstrap repositories
 
 @sle15sp5s390_minion
   Scenario: Create the bootstrap repository for a SLES 15 SP5 s390x minion
-    When I create the bootstrap repository for "sle15sp5s390_minion" on the server
+    When I create the bootstrap repository for "sle15sp5s390_minion" on the server without flushing
diff --git a/testsuite/features/step_definitions/command_steps.rb b/testsuite/features/step_definitions/command_steps.rb
@@ -1048,18 +1048,22 @@
   end
 end
 
-When(/^I create the bootstrap repository for "([^"]*)" on the server$/) do |host|
+When(/^I create the bootstrap repository for "([^"]*)" on the server((?: without flushing)?)$/) do |host, without_flushing|
   base_channel = BASE_CHANNEL_BY_CLIENT[product][host]
   channel = CHANNEL_LABEL_TO_SYNC_BY_BASE_CHANNEL[product][base_channel]
   parent_channel = PARENT_CHANNEL_LABEL_TO_SYNC_BY_BASE_CHANNEL[product][base_channel]
   get_target('server').wait_while_process_running('mgr-create-bootstrap-repo')
+
   cmd =
     if parent_channel.nil?
-      "mgr-create-bootstrap-repo --create #{channel} --with-custom-channels --flush"
+      "mgr-create-bootstrap-repo --create #{channel} --with-custom-channels"
     else
-      "mgr-create-bootstrap-repo --create #{channel} --with-parent-channel #{parent_channel} --with-custom-channels --flush"
+      "mgr-create-bootstrap-repo --create #{channel} --with-parent-channel #{parent_channel} --with-custom-channels"
     end
-  log 'Creating the boostrap repository on the server:'
+
+  cmd += ' --flush' unless without_flushing
+
+  log 'Creating the bootstrap repository on the server:'
   log "  #{cmd}"
   get_target('server').run(cmd)
 end