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

uyuni-project · Sep 13, 2023 · 65260c1 · 65260c1
1 parent 4517565
commit 65260c1
Show file tree

Hide file tree

Showing 6 changed files with 463 additions and 228 deletions.
diff --git a/testsuite/features/build_validation/reposync/srv_sync_all_products.feature b/testsuite/features/build_validation/reposync/srv_sync_all_products.feature
@@ -21,6 +21,7 @@ Feature: Synchronize products in the products page of the Setup Wizard
     Then I should see the "SUSE Linux Enterprise Server LTSS 12 SP4 x86_64" selected
     When I click the Add Product button
     And I wait until I see "SUSE Linux Enterprise Server 12 SP4 x86_64" product has been added
+    And I wait until all synchronized channels for "sles12-sp4" have finished
 
 @uyuni
 @sle12sp4_minion
@@ -36,6 +37,7 @@ Feature: Synchronize products in the products page of the Setup Wizard
     Then I should see the "SUSE Linux Enterprise Server 12 SP5 x86_64" selected
     When I click the Add Product button
     And I wait until I see "SUSE Linux Enterprise Server 12 SP5 x86_64" product has been added
+    And I wait until all synchronized channels for "sles12-sp5" have finished
 
 @uyuni
 @sle12sp5_minion
@@ -54,6 +56,7 @@ Feature: Synchronize products in the products page of the Setup Wizard
     Then I should see the "SUSE Linux Enterprise Server LTSS 15 SP1 x86_64" selected
     When I click the Add Product button
     And I wait until I see "SUSE Linux Enterprise Server 15 SP1 x86_64" product has been added
+    And I wait until all synchronized channels for "sles15-sp1" have finished
 
 @uyuni
 @sle15sp1_minion
@@ -78,6 +81,7 @@ Feature: Synchronize products in the products page of the Setup Wizard
     Then I should see the "Development Tools Module 15 SP2 x86_64" selected
     When I click the Add Product button
     And I wait until I see "SUSE Linux Enterprise Server 15 SP2 x86_64" product has been added
+    And I wait until all synchronized channels for "sles15-sp2" have finished
 
 @uyuni
 @sle15sp2_minion
@@ -103,6 +107,7 @@ Feature: Synchronize products in the products page of the Setup Wizard
     When I click the Add Product button
     And I wait until I see "Selected channels/products were scheduled successfully for syncing." text
     And I wait until I see "SUSE Linux Enterprise Server 15 SP3 x86_64" product has been added
+    And I wait until all synchronized channels for "sles15-sp3" have finished
 
 @uyuni
 @sle15sp3_minion
@@ -126,29 +131,31 @@ Feature: Synchronize products in the products page of the Setup Wizard
     When I click the Add Product button
     And I wait until I see "Selected channels/products were scheduled successfully for syncing." text
     And I wait until I see "SUSE Linux Enterprise Server 15 SP4 x86_64" product has been added
+    And I wait until all synchronized channels for "sles15-sp4" have finished
 
 @uyuni
 @sle15sp4_minion
   Scenario: Add SUSE Linux Enterprise Server 15 SP4 Uyuni Client tools
     When I use spacewalk-common-channel to add channel "sles15-sp4-devel-uyuni-client" with arch "x86_64"
 
 @sle15sp5_minion
-Scenario: Add SUSE Linux Enterprise Server 15 SP5
-  When I follow the left menu "Admin > Setup Wizard > Products"
-  And I wait until I do not see "Loading" text
-  And I enter "SUSE Linux Enterprise Server 15 SP5" as the filtered product description
-  And I select "SUSE Linux Enterprise Server 15 SP5 x86_64" as a product
-  Then I should see the "SUSE Linux Enterprise Server 15 SP5 x86_64" selected
-  When I open the sub-list of the product "SUSE Linux Enterprise Server 15 SP5 x86_64"
-  And I open the sub-list of the product "Basesystem Module 15 SP5 x86_64"
-  And I select "Desktop Applications Module 15 SP5 x86_64" as a product
-  Then I should see the "Desktop Applications Module 15 SP5 x86_64" selected
-  When I open the sub-list of the product "Desktop Applications Module 15 SP5 x86_64"
-  And I select "Development Tools Module 15 SP5 x86_64" as a product
-  Then I should see the "Development Tools Module 15 SP5 x86_64" selected
-  When I click the Add Product button
-  And I wait until I see "Selected channels/products were scheduled successfully for syncing." text
-  And I wait until I see "SUSE Linux Enterprise Server 15 SP5 x86_64" product has been added
+  Scenario: Add SUSE Linux Enterprise Server 15 SP5
+    When I follow the left menu "Admin > Setup Wizard > Products"
+    And I wait until I do not see "Loading" text
+    And I enter "SUSE Linux Enterprise Server 15 SP5" as the filtered product description
+    And I select "SUSE Linux Enterprise Server 15 SP5 x86_64" as a product
+    Then I should see the "SUSE Linux Enterprise Server 15 SP5 x86_64" selected
+    When I open the sub-list of the product "SUSE Linux Enterprise Server 15 SP5 x86_64"
+    And I open the sub-list of the product "Basesystem Module 15 SP5 x86_64"
+    And I select "Desktop Applications Module 15 SP5 x86_64" as a product
+    Then I should see the "Desktop Applications Module 15 SP5 x86_64" selected
+    When I open the sub-list of the product "Desktop Applications Module 15 SP5 x86_64"
+    And I select "Development Tools Module 15 SP5 x86_64" as a product
+    Then I should see the "Development Tools Module 15 SP5 x86_64" selected
+    When I click the Add Product button
+    And I wait until I see "Selected channels/products were scheduled successfully for syncing." text
+    And I wait until I see "SUSE Linux Enterprise Server 15 SP5 x86_64" product has been added
+    And I wait until all synchronized channels for "sles15-sp5" have finished
 
 @uyuni
 @sle15sp5_minion
@@ -169,6 +176,7 @@ Scenario: Add SUSE Linux Enterprise Server 15 SP5
     When I click the Add Product button
     And I wait until I see "Selected channels/products were scheduled successfully for syncing." text
     And I wait until I see "SUSE Linux Enterprise Micro 5.1 x86_64" product has been added
+    And I wait until all synchronized channels for "suse-microos-5.1" have finished
 
 @uyuni
 @slemicro51_minion
@@ -201,6 +209,7 @@ Scenario: Add SUSE Linux Enterprise Server 15 SP5
     When I click the Add Product button
     And I wait until I see "Selected channels/products were scheduled successfully for syncing." text
     And I wait until I see "SUSE Linux Enterprise Micro 5.2 x86_64" product has been added
+    And I wait until all synchronized channels for "suse-microos-5.2" have finished
 
 @uyuyni
 @slemicro52_minion
@@ -233,6 +242,7 @@ Scenario: Add SUSE Linux Enterprise Server 15 SP5
     When I click the Add Product button
     And I wait until I see "Selected channels/products were scheduled successfully for syncing." text
     And I wait until I see "SUSE Linux Enterprise Micro 5.3 x86_64" product has been added
+    And I wait until all synchronized channels for "sle-micro-5.3" have finished
 
 @uyuni
 @slemicro53_minion
@@ -265,6 +275,7 @@ Scenario: Add SUSE Linux Enterprise Server 15 SP5
     When I click the Add Product button
     And I wait until I see "Selected channels/products were scheduled successfully for syncing." text
     And I wait until I see "SUSE Linux Enterprise Micro 5.4 x86_64" product has been added
+    And I wait until all synchronized channels for "sle-micro-5.4" have finished
 
 # disabled until a new Uyuni version will be released
 # @uyuni
@@ -295,11 +306,13 @@ Scenario: Add SUSE Linux Enterprise Server 15 SP5
     When I click the Add Product button
     And I wait until I see "Selected channels/products were scheduled successfully for syncing." text
     And I wait until I see "openSUSE Leap 15.4 aarch64" product has been added
+    And I wait until all synchronized channels for "leap15.4-aarch64" have finished
 
 @uyuni
 @opensuse154arm_minion
   Scenario: Add openSUSE 15.4 for ARM Uyuni Client tools
     When I use spacewalk-common-channel to add channel "opensuse_leap15_4 opensuse_leap15_4-backports-updates opensuse_leap15_4-non-oss opensuse_leap15_4-non-oss-updates opensuse_leap15_4-sle-updates opensuse_leap15_4-updates opensuse_leap15_4-uyuni-client-devel" with arch "aarch64"
+    And I wait until all synchronized channels for "leap15.4-aarch64" have finished
 
 @susemanager
 @opensuse155arm_minion
@@ -312,11 +325,13 @@ Scenario: Add SUSE Linux Enterprise Server 15 SP5
     When I click the Add Product button
     And I wait until I see "Selected channels/products were scheduled successfully for syncing." text
     And I wait until I see "openSUSE Leap 15.5 aarch64" product has been added
+    And I wait until all synchronized channels for "leap15.5-aarch64" have finished
 
 @uyuni
 @opensuse155arm_minion
   Scenario: Add openSUSE 15.5 for ARM Uyuni Client tools
     When I use spacewalk-common-channel to add channel "opensuse_leap15_5 opensuse_leap15_5-backports-updates opensuse_leap15_5-non-oss opensuse_leap15_5-non-oss-updates opensuse_leap15_5-sle-updates opensuse_leap15_5-updates opensuse_leap15_5-uyuni-client-devel" with arch "aarch64"
+    And I wait until all synchronized channels for "leap15.5-aarch64" have finished
 
 @susemanager
 @alma9_minion
@@ -328,11 +343,13 @@ Scenario: Add SUSE Linux Enterprise Server 15 SP5
     Then I should see the "AlmaLinux 9 x86_64" selected
     When I click the Add Product button
     And I wait until I see "AlmaLinux 9 x86_64" product has been added
+    And I wait until all synchronized channels for "almalinux9" have finished
 
 @uyuni
 @alma9_minion
   Scenario: Add Alma Linux 9
     When I use spacewalk-common-channel to add channel "almalinux9 almalinux9-appstream almalinux9-extras almalinux9-uyuni-client-devel" with arch "x86_64"
+    And I wait until all synchronized channels for "almalinux9" have finished
 
 @susemanager
 @centos7_minion
@@ -344,11 +361,13 @@ Scenario: Add SUSE Linux Enterprise Server 15 SP5
     Then I should see the "SUSE Linux Enterprise Server with Expanded Support 7" selected
     When I click the Add Product button
     And I wait until I see "SUSE Linux Enterprise Server with Expanded Support 7" product has been added
+    And I wait until all synchronized channels for "res7" have finished
 
 @uyuni
 @centos7_minion
   Scenario: Add CentOS 7
     When I use spacewalk-common-channel to add channel "centos7 centos7-extras centos7-uyuni-client-devel" with arch "x86_64"
+    And I wait until all synchronized channels for "res7" have finished
 
 @susemanager
 @liberty9_minion
@@ -360,11 +379,21 @@ Scenario: Add SUSE Linux Enterprise Server 15 SP5
     Then I should see the "RHEL and Liberty 9 Base" selected
     When I click the Add Product button
     And I wait until I see "RHEL and Liberty 9 Base" product has been added
+    And I wait until all synchronized channels for "el9" have finished
+
+@liberty9_minion
+  Scenario: Add Liberty Linux 9
+    When I follow the left menu "Admin > Setup Wizard > Products"
+    And I wait until I do not see "Loading" text
+    And I enter "RHEL and Liberty 9 Base" as the filtered product description
+    And I select "RHEL and Liberty 9 Base" as a product
+    Then I should see the "RHEL and Liberty 9 Base" selected
     When I open the sub-list of the product "RHEL and Liberty 9 Base"
     And I select "SUSE Liberty Linux 9" as a product
     Then I should see the "SUSE Liberty Linux 9" selected
     When I click the Add Product button
     And I wait until I see "SUSE Liberty Linux 9" product has been added
+    And I wait until all synchronized channels for "sll-9" have finished
 
 @susemanager
 @oracle9_minion
@@ -376,11 +405,13 @@ Scenario: Add SUSE Linux Enterprise Server 15 SP5
     Then I should see the "Oracle Linux 9 x86_64" selected
     When I click the Add Product button
     And I wait until I see "Oracle Linux 9 x86_64" product has been added
+    And I wait until all synchronized channels for "oraclelinux9" have finished
 
 @uyuni
 @oracle9_minion
   Scenario: Add Oracle Linux 9
     When I use spacewalk-common-channel to add channel "oraclelinux9 oraclelinux9-appstream oraclelinux9-uyuni-client-devel" with arch "x86_64"
+    And I wait until all synchronized channels for "oraclelinux9" have finished
 
 @rhel9_minion
   Scenario: Add RHEL 9
@@ -405,11 +436,13 @@ Scenario: Add SUSE Linux Enterprise Server 15 SP5
     Then I should see the "SUSE Linux Enterprise Server with Expanded Support 8" selected
     When I click the Add Product button
     And I wait until I see "RHEL or SLES ES or CentOS 8 Base" product has been added
+    And I wait until all synchronized channels for "res8" have finished
 
 @uyuni
 @rocky8_minion
   Scenario: Add Rocky Linux 8
     When I use spacewalk-common-channel to add channel "rockylinux8 rockylinux8-appstream rockylinux8-extras rockylinux8-uyuni-client-devel" with arch "x86_64"
+    And I wait until all synchronized channels for "res8" have finished
 
 @susemanager
 @rocky9_minion
@@ -421,6 +454,7 @@ Scenario: Add SUSE Linux Enterprise Server 15 SP5
     Then I should see the "Rocky Linux 9 x86_64" selected
     When I click the Add Product button
     And I wait until I see "Rocky Linux 9 x86_64" product has been added
+    And I wait until all synchronized channels for "rockylinux-9" have finished
 
 @ubuntu2004_minion
   Scenario: Add Ubuntu 20.04
@@ -431,11 +465,13 @@ Scenario: Add SUSE Linux Enterprise Server 15 SP5
     Then I should see the "Ubuntu 20.04" selected
     When I click the Add Product button
     And I wait until I see "Ubuntu 20.04" product has been added
+    And I wait until all synchronized channels for "ubuntu-2004" have finished
 
 @uyuni
 @ubuntu2004_minion
   Scenario: Add Ubuntu 20.04
     When I use spacewalk-common-channel to add channel "ubuntu-2004-pool-amd64-uyuni ubuntu-2004-amd64-main-uyuni ubuntu-2004-amd64-main-updates-uyuni ubuntu-2004-amd64-main-security-uyuni ubuntu-2004-amd64-universe-uyuni ubuntu-2004-amd64-universe-updates-uyuni ubuntu-2004-amd64-universe-security-uyuni ubuntu-2004-amd64-universe-backports-uyuni ubuntu-2004-amd64-uyuni-client-devel" with arch "amd64-deb"
+    And I wait until all synchronized channels for "ubuntu-2004" have finished
 
 @susemanager
 @ubuntu2204_minion
@@ -447,11 +483,13 @@ Scenario: Add SUSE Linux Enterprise Server 15 SP5
     Then I should see the "Ubuntu 22.04" selected
     When I click the Add Product button
     And I wait until I see "Ubuntu 22.04" product has been added
+    And I wait until all synchronized channels for "ubuntu-2204" have finished
 
 @uyuni
 @ubuntu2204_minion
   Scenario: Add Ubuntu 22.04
     When I use spacewalk-common-channel to add channel "ubuntu-2204-pool-amd64-uyuni ubuntu-2204-amd64-main-uyuni ubuntu-2204-amd64-main-updates-uyuni ubuntu-2204-amd64-main-security-uyuni ubuntu-2204-amd64-universe-uyuni ubuntu-2204-amd64-universe-updates-uyuni ubuntu-2204-amd64-universe-security-uyuni ubuntu-2204-amd64-universe-backports-uyuni ubuntu-2204-amd64-uyuni-client-devel" with arch "amd64-deb"
+    And I wait until all synchronized channels for "ubuntu-2204" have finished
 
 @susemanager
 @debian10_minion
@@ -463,11 +501,13 @@ Scenario: Add SUSE Linux Enterprise Server 15 SP5
     Then I should see the "Debian 10" selected
     When I click the Add Product button
     And I wait until I see "Debian 10" product has been added
+    And I wait until all synchronized channels for "debian-10" have finished
 
 @uyuni
 @debian10_minion
   Scenario: Add Debian 10
     When I use spacewalk-common-channel to add channel "debian-10-pool-amd64-uyuni debian-10-amd64-main-updates-uyuni debian-10-amd64-main-security-uyuni debian-10-amd64-uyuni-client-devel" with arch "amd64-deb"
+    And I wait until all synchronized channels for "debian-10" have finished
 
 @susemanager
 @debian11_minion
@@ -478,12 +518,14 @@ Scenario: Add SUSE Linux Enterprise Server 15 SP5
     And I select "Debian 11" as a product
     Then I should see the "Debian 11" selected
     When I click the Add Product button
-     And I wait until I see "Debian 11" product has been added
+    And I wait until I see "Debian 11" product has been added
+    And I wait until all synchronized channels for "debian-11" have finished
 
 @uyuni
 @debian11_minion
   Scenario: Add Debian 11
     When I use spacewalk-common-channel to add channel "debian-11-pool-amd64-uyuni debian-11-amd64-main-updates-uyuni debian-11-amd64-main-security-uyuni debian-11-amd64-uyuni-client-devel" with arch "amd64-deb"
+    And I wait until all synchronized channels for "debian-11" have finished
 
 @susemanager
 @proxy
@@ -496,11 +538,13 @@ Scenario: Add SUSE Linux Enterprise Server 15 SP5
     When I click the Add Product button
     And I wait until I see "Selected channels/products were scheduled successfully for syncing." text
     And I wait until I see "SUSE Manager Proxy 4.3 x86_64" product has been added
+    And I wait until all synchronized channels for "suma-proxy-43" have finished
 
 @uyuni
 @proxy
   Scenario: Add Uyuni Leap 15.4 Proxy, inlcuding Uyuni Client Tools
     When I use spacewalk-common-channel to add channel "opensuse_leap15_4 opensuse_leap15_4-non-oss opensuse_leap15_4-non-oss-updates opensuse_leap15_4-updates opensuse_leap15_4-backports-updates opensuse_leap15_4-sle-updates uyuni-proxy-stable-leap-154 opensuse_leap15_4-uyuni-client-devel" with arch "x86_64"
+    And I wait until all synchronized channels for "uyuni-proxy" have finished
 
 @susemanager
 @proxy
@@ -513,6 +557,7 @@ Scenario: Add SUSE Linux Enterprise Server 15 SP5
     When I click the Add Product button
     And I wait until I see "Selected channels/products were scheduled successfully for syncing." text
     And I wait until I see "SUSE Manager Retail Branch Server 4.3 x86_64" product has been added
+    And I wait until all synchronized channels for "suma-retail-branch-server-43" have finished
 
   Scenario: Detect product loading issues from the UI in Build Validation
     When I follow the left menu "Admin > Setup Wizard > Products"

diff --git a/testsuite/features/reposync/srv_sync_products.feature b/testsuite/features/reposync/srv_sync_products.feature
@@ -61,10 +61,12 @@ Feature: Synchronize products in the products page of the Setup Wizard
     When I click the Add Product button
     And I wait until I see "SUSE Linux Enterprise Server 15 SP4 x86_64" product has been added
     Then the SLE15 SP4 product should be added
+    When I wait until all synchronized channels for "sles15-sp4" have finished
 
 @uyuni
   Scenario: Add openSUSE Leap 15.5 product, including Uyuni Client Tools
     When I use spacewalk-common-channel to add channel "opensuse_leap15_5 opensuse_leap15_5-non-oss opensuse_leap15_5-non-oss-updates opensuse_leap15_5-updates opensuse_leap15_5-backports-updates opensuse_leap15_5-sle-updates uyuni-proxy-devel-leap opensuse_leap15_5-uyuni-client" with arch "x86_64"
+    And I wait until all synchronized channels for "leap15.5-x86_64" have finished
 
 @proxy
 @susemanager
@@ -77,6 +79,7 @@ Feature: Synchronize products in the products page of the Setup Wizard
     When I click the Add Product button
     And I wait until I see "Selected channels/products were scheduled successfully for syncing." text
     And I wait until I see "SUSE Manager Proxy 4.3 x86_64" product has been added
+    And I wait until all synchronized channels for "suma-proxy-43" have finished
 
 @proxy
 @susemanager
@@ -89,6 +92,7 @@ Feature: Synchronize products in the products page of the Setup Wizard
     When I click the Add Product button
     And I wait until I see "Selected channels/products were scheduled successfully for syncing." text
     And I wait until I see "SUSE Manager Retail Branch Server 4.3 x86_64" product has been added
+    And I wait until all synchronized channels for "suma-retail-branch-server-43" have finished
 
 @scc_credentials
 @susemanager