QE: Improve how we wait for each product to be synchronized

testsuite/README.md

@@ -75,10 +75,10 @@ The Open Build System (OBS) projects are:
 - [https://build.opensuse.org/project/show/systemsmanagement:Uyuni:Test-Packages:Pool](https://build.opensuse.org/project/show/systemsmanagement:Uyuni:Test-Packages:Pool):
 packages which must be installed on the client systems already;
 - [https://build.opensuse.org/project/show/systemsmanagement:Uyuni:Test-Packages:Updates](https://build.opensuse.org/project/show/systemsmanagement:Uyuni:Test-Packages:Updates):
-packages for `Test-Channel-x86_64` and `Test-Channel-Deb-AMD64` channels.
+packages for `Test-Base-Channel-x86_64` and `Fake-Base-Channel-Debian-like` channels.
 
 ## Type of provided packages
 
 - Normal dummy packages: `andromeda-dummy`, `hoag-dummy`, `orion-dummy`, `milkyway-dummy`, etc.
 - Wrong encoding of RPM attributes: `blackhole-dummy`. This package should be successfully imported and you will see it
-available as part of the `Test-Channel-x86_64` if reposync handled the encoding correctly.
+available as part of the `Test-Base-Channel-x86_64` if reposync handled the encoding correctly.

testsuite/documentation/cucumber-steps.md

@@ -514,7 +514,7 @@ Note that the text area variant handles the new lines characters while the other
 * Download a package from a channel
 
 ```gherkin
-  When I try to download "virgo-dummy-2.0-1.1.noarch.rpm" from channel "test-channel-x86_64"
+  When I try to download "virgo-dummy-2.0-1.1.noarch.rpm" from channel "test-base-channel-x86_64"
   Then the download should get a 403 response
   Then the download should get no error
 ```

testsuite/features/build_validation/add_MU_repositories/add_maintenance_update_repositories.template

@@ -39,3 +39,7 @@ Feature: Add a Maintenance Update custom channel and the custom repositories for
     And I follow "Sync"
     And I click on "Sync Now"
     Then I should see a "Repository sync scheduled" text or "No repositories are currently associated with this channel" text
+
+  Scenario: Wait for running reposyncs to finish after adding custom channel for <client>
+    When I wait until the channel "custom_channel_<client>" has been synced
+    Then the "custom_channel_<client>" reposync logs should not report errors

testsuite/features/build_validation/add_non_MU_repositories/centos7_minion_add_iso.feature

@@ -44,3 +44,6 @@ Feature: Add the CentOS 7 distribution custom repositories
     And I follow "Sync"
     And I click on "Sync Now"
     Then I should see a "Repository sync scheduled" text
+
+  Scenario: The custom channel for Centos 7 DVD has been synced
+    When I wait until the channel "centos-7-iso" has been synced

testsuite/features/build_validation/migration/sle15sp3_minion.feature

@@ -41,7 +41,7 @@ Feature: Migrate a SLES 15 SP3 Salt minion to 15 SP4
     When I follow "Software" in the content area
     And I follow "Software Channels" in the content area
     And I wait until I do not see "Loading..." text
-    And I check radio button "Test-Channel-x86_64"
+    And I check radio button "Test-Base-Channel-x86_64"
     And I wait until I do not see "Loading..." text
     And I click on "Next"
     Then I should see a "Confirm Software Channel Change" text

testsuite/features/build_validation/migration/sle15sp3_ssh_minion.feature

@@ -42,7 +42,7 @@ Feature: Migrate a SLES 15 SP3 Salt SSH minion to 15 SP4
     When I follow "Software" in the content area
     And I follow "Software Channels" in the content area
     And I wait until I do not see "Loading..." text
-    And I check radio button "Test-Channel-x86_64"
+    And I check radio button "Test-Base-Channel-x86_64"
     And I wait until I do not see "Loading..." text
     And I click on "Next"
     Then I should see a "Confirm Software Channel Change" text

testsuite/features/reposync/srv_wait_for_reposync.feature → testsuite/features/build_validation/reposync/srv_disable_scheduled_reposync.feature

@@ -1,7 +1,7 @@
 # Copyright (c) 2019-2023 SUSE LLC
 # Licensed under the terms of the MIT license.
 
-Feature: Wait for reposync activity to finish in CI context
+Feature: Delete the scheduled task for mgr-sync-refresh
 
   Scenario: Log in as admin user
     Given I am authorized for the "Admin" section
@@ -12,9 +12,3 @@ Feature: Wait for reposync activity to finish in CI context
     And I choose "disabled"
     And I click on "Update Schedule"
     And I click on "Delete Schedule"
-
-  Scenario: Kill running reposyncs or wait for them to finish
-    When I kill all running spacewalk-repo-sync, excepted the ones needed to bootstrap
-
-  Scenario: Wait until all synchronized channels have finished
-    When I wait until all synchronized channels have finished

testsuite/features/github_validation/core/create_repository.feature

@@ -30,24 +30,24 @@ Feature: Add a repository to a channel
 
   Scenario: Add the repository to the x86_64 channel
     When I follow the left menu "Software > Manage > Channels"
-    And I follow "Test-Channel-x86_64"
+    And I follow "Test-Base-Channel-x86_64"
     And I enter "file:///etc/pki/rpm-gpg/uyuni-tools-gpg-pubkey-0d20833e.key" as "GPG key URL"
     And I click on "Update Channel"
-    Then I should see a "Channel Test-Channel-x86_64 updated" text
+    Then I should see a "Channel Test-Base-Channel-x86_64 updated" text
     When I follow "Repositories" in the content area
     And I select the "fake-rpm-repo" repo
     And I click on "Save Repositories"
-    Then I should see a "Test-Channel-x86_64 repository information was successfully updated" text
+    Then I should see a "Test-Base-Channel-x86_64 repository information was successfully updated" text
 
   Scenario: Synchronize the repository in the x86_64 channel
     When I follow the left menu "Software > Manage > Channels"
-    And I follow "Test-Channel-x86_64"
+    And I follow "Test-Base-Channel-x86_64"
     And I follow "Repositories" in the content area
     And I follow "Sync"
     And I wait at most 60 seconds until I do not see "Repository sync is running." text, refreshing the page
     And I click on "Sync Now"
-    Then I should see a "Repository sync scheduled for Test-Channel-x86_64." text
-    And I wait until the channel "test-channel-x86_64" has been synced
+    Then I should see a "Repository sync scheduled for Test-Base-Channel-x86_64." text
+    And I wait until the channel "test-base-channel-x86_64" has been synced
 
   Scenario: Add a test repository for i586
     When I follow the left menu "Software > Manage > Repositories"
@@ -60,23 +60,23 @@ Feature: Add a repository to a channel
 
   Scenario: Add the repository to the i586 channel
     When I follow the left menu "Software > Manage > Channels"
-    And I follow "Fake-i586-Channel"
+    And I follow "Fake-Base-Channel-i586"
     And I enter "file:///etc/pki/rpm-gpg/uyuni-tools-gpg-pubkey-0d20833e.key" as "GPG key URL"
     And I click on "Update Channel"
-    Then I should see a "Channel Fake-i586-Channel updated" text
+    Then I should see a "Channel Fake-Base-Channel-i586 updated" text
     When I follow "Repositories" in the content area
     And I select the "fake-i586-repo" repo
     And I click on "Save Repositories"
-    Then I should see a "Fake-i586-Channel repository information was successfully updated" text
+    Then I should see a "Fake-Base-Channel-i586 repository information was successfully updated" text
 
   Scenario: Synchronize the repository in the i586 channel
     When I follow the left menu "Software > Manage > Channels"
-    And I follow "Fake-i586-Channel"
+    And I follow "Fake-Base-Channel-i586"
     And I follow "Repositories" in the content area
     And I follow "Sync"
     And I wait at most 60 seconds until I do not see "Repository sync is running." text, refreshing the page
     And I click on "Sync Now"
-    Then I should see a "Repository sync scheduled for Fake-i586-Channel." text
+    Then I should see a "Repository sync scheduled for Fake-Base-Channel-i586." text
 
 @deblike_minion
   Scenario: Add a test repository for Debian-like
@@ -91,34 +91,33 @@ Feature: Add a repository to a channel
 @deblike_minion
   Scenario: Add the Debian-like repository to the AMD64 channel
     When I follow the left menu "Software > Manage > Channels"
-    And I follow "Fake-Deb-AMD64-Channel"
+    And I follow "Fake-Base-Channel-Debian-like"
     And I follow "Repositories" in the content area
     And I select the "fake-debian-repo" repo
     And I click on "Save Repositories"
-    Then I should see a "Fake-Deb-AMD64-Channel repository information was successfully updated" text
+    Then I should see a "Fake-Base-Channel-Debian-like repository information was successfully updated" text
 
 @deblike_minion
   Scenario: Synchronize the Debian-like repository in the AMD64 channel
     When I follow the left menu "Software > Manage > Channels"
-    And I follow "Fake-Deb-AMD64-Channel"
+    And I follow "Fake-Base-Channel-Debian-like"
     And I follow "Repositories" in the content area
     And I follow "Sync"
     And I wait at most 60 seconds until I do not see "Repository sync is running." text, refreshing the page
     And I click on "Sync Now"
-    Then I should see a "Repository sync scheduled for Fake-Deb-AMD64-Channel." text
+    Then I should see a "Repository sync scheduled for Fake-Base-Channel-Debian-like." text
 
 @rhlike_minion
   Scenario: Add the repository to the RedHat-like channel
     When I follow the left menu "Software > Manage > Channels"
-    And I follow "Fake-RH-Like-Channel"
+    And I follow "Fake-Base-Channel-RH-like"
     And I enter "file:///etc/pki/rpm-gpg/uyuni-tools-gpg-pubkey-0d20833e.key" as "GPG key URL"
     And I click on "Update Channel"
-    Then I should see a "Channel Fake-RH-Like-Channel updated" text
+    Then I should see a "Channel Fake-Base-Channel-RH-like updated" text
     When I follow "Repositories" in the content area
     And I select the "fake-rpm-repo" repo
     And I click on "Save Repositories"
-    Then I should see a "Fake-RH-Like-Channel repository information was successfully updated" text
+    Then I should see a "Fake-Base-Channel-RH-like repository information was successfully updated" text
 
   Scenario: Cleanup disable source package syncing
     Then I disable source package syncing
-

testsuite/features/github_validation/init_clients/sle_minion.feature

@@ -21,12 +21,11 @@ Feature: Bootstrap a Salt minion via the GUI
     When I follow "Software" in the content area
     And I follow "Software Channels" in the content area
     And I wait until I do not see "Loading..." text
-    And I check radio button "Fake Base Channel"
+    And I check radio button "Fake-Base-Channel"
     And I wait until I do not see "Loading..." text
     And I check "Fake-RPM-SUSE-Channel"
     And I click on "Next"
     Then I should see a "Confirm Software Channel Change" text
     When I click on "Confirm"
     Then I should see a "Changing the channels has been scheduled." text
     And I wait until event "Subscribe channels scheduled by admin" is completed
-

testsuite/features/github_validation/init_clients/sle_ssh_minion.feature

@@ -23,7 +23,7 @@ Feature: Bootstrap a Salt host managed via salt-ssh
     When I follow "Software" in the content area
     And I follow "Software Channels" in the content area
     And I wait until I do not see "Loading..." text
-    And I check radio button "Fake Base Channel"
+    And I check radio button "Fake-Base-Channel"
     And I wait until I do not see "Loading..." text
     And I check "Fake-RPM-SUSE-Channel"
     And I click on "Next"

testsuite/features/init_clients/min_deblike_salt.feature

@@ -45,7 +45,7 @@ Feature: Bootstrap a Debian-like minion and do some basic operations on it
     When I follow "Software" in the content area
     And I follow "Software Channels" in the content area
     And I wait until I do not see "Loading..." text
-    And I check radio button "Fake-Deb-AMD64-Channel"
+    And I check radio button "Fake-Base-Channel-Debian-like"
     And I wait until I do not see "Loading..." text
     And I click on "Next"
     Then I should see a "Confirm Software Channel Change" text

testsuite/features/init_clients/min_rhlike_salt.feature

@@ -44,7 +44,7 @@ Feature: Bootstrap a Red Hat-like minion and do some basic operations on it
     When I follow "Software" in the content area
     And I follow "Software Channels" in the content area
     And I wait until I do not see "Loading..." text
-    And I check radio button "Fake Base Channel"
+    And I check radio button "Fake-Base-Channel"
     And I wait until I do not see "Loading..." text
     And I click on "Next"
     Then I should see a "Confirm Software Channel Change" text

testsuite/features/init_clients/min_virthost.feature

@@ -17,7 +17,7 @@ Feature: Bootstrap a virtualization host minion and set it up for virtualization
     When I enter "KVM testing" as "description"
     And I enter "KVM-TEST" as "key"
     And I enter "20" as "usageLimit"
-    And I select "Test-Channel-x86_64" from "selectedBaseChannel"
+    And I select "Test-Base-Channel-x86_64" from "selectedBaseChannel"
     And I click on "Create Activation Key"
     Then I should see a "Activation key KVM testing has been created" text