ci/ui: fix upgrade UI extension tests

rancher · Feb 21, 2025 · a99e705 · a99e705
1 parent 125c65c
commit a99e705
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/tests/cypress/latest/e2e/unit_tests/elemental_plugin.spec.ts b/tests/cypress/latest/e2e/unit_tests/elemental_plugin.spec.ts
@@ -31,10 +31,8 @@ filterTests(['main', 'upgrade'], () => {
 
     qase(11,
       it('Add elemental-ui repo', () => {
-        // 1 - TODO: Remove rancher 2-10 condition later
-        // 2 - UI extension upgrade cannot be tested with rancher manager 2.10 yet
-        // because we have only one version so far
-        if (!isUIVersion('stable') || isRancherManagerVersion('2.10')) {
+        // Only when we want the stable version of the UI, mainly used for the upgrade tests
+        if (!isUIVersion('stable')) {
           cypressLib.addRepository('elemental-ui', 'https://github.com/rancher/elemental-ui.git', 'git', 'gh-pages');
         }
       })

diff --git a/tests/cypress/latest/e2e/unit_tests/upgrade-ui-extension.spec.ts b/tests/cypress/latest/e2e/unit_tests/upgrade-ui-extension.spec.ts
@@ -30,11 +30,8 @@ describe('UI extension upgrade tests', () => {
   });
 
   filterTests(['upgrade'], () => {
-    // 1 - Enable only with K3S because still too much flaky with RKE2
-    // 2 - TODO: Remove rancher 2-11 condition later
-    // UI extension upgrade cannot be upgraded with rancher manager 2.11 yet
-    // because we have only one version so far
-    if (utils.isK8sVersion('k3s') && !utils.isRancherManagerVersion('2.11')) {
+    // Enable only with K3S because still too much flaky with RKE2
+    if (utils.isK8sVersion('k3s')) {
       it('Add elemental-ui dev repo', () => {
         cypressLib.addRepository('elemental-ui', 'https://github.com/rancher/elemental-ui.git', 'git', 'gh-pages');
       });