Updated timeouts and moved test Fleet-51 to special (#422)

Author: sbulage

tests/cypress/e2e/unit_tests/p1_2_fleet.spec.ts

@@ -1009,61 +1009,6 @@ if (!/\/2\.7/.test(Cypress.env('rancher_version')) && !/\/2\.8/.test(Cypress.env
   });
 }
 
-describe('Test move cluster to newly created workspace and deploy application to it.', { tags: '@p1_2'}, () => {
-  qase(51,
-    it("Fleet-51: Test move cluster to newly created workspace and deploy application to it.", { tags: '@fleet-51' }, () => {
-      const repoName = 'default-cluster-new-workspace-51'
-      const branch = "master"
-      const path = "simple"
-      const repoUrl = "https://github.com/rancher/fleet-examples"
-      const flagName = "provisioningv2-fleet-workspace-back-population"
-      const newWorkspaceName = "new-fleet-workspace"
-      const fleetDefault = "fleet-default"
-      let timeout = 30000
-
-      //Version check for 2.12 (head)
-      if (supported_versions_212_and_above.some(r => r.test(rancherVersion))) {
-        timeout = 60000
-      }
-
-      // Enable cluster can move to another Fleet workspace feature flag.
-      cy.enableFeatureFlag(flagName);
-
-      // Create new workspace.
-      cy.createNewFleetWorkspace(newWorkspaceName);
-
-      // Switch to 'fleet-default' workspace
-      cy.fleetNamespaceToggle(fleetDefault);
-      cy.clickNavMenu(['Clusters']);
-
-      // Move first cluster i.e. 'imported-0' to newly created workspace.
-      cy.moveClusterToWorkspace(dsFirstClusterName, newWorkspaceName, timeout);
-
-      // Create a GitRepo targeting to cluster available in newly created workspace.
-      cy.addFleetGitRepo({ repoName, repoUrl, branch, path });
-      cy.fleetNamespaceToggle(newWorkspaceName);
-      cy.clickButton('Create');
-
-      // Review below line after all tests passed.
-      cy.checkGitRepoStatus(repoName, '1 / 1', '6 / 6');
-
-      // Delete GitRepo
-      // In Fleet Workspace, namespace name similarly treated as namespace.
-      cy.deleteAllFleetRepos(newWorkspaceName);
-
-      // Move cluster back to 'fleet-default' workspace
-      cy.fleetNamespaceToggle(newWorkspaceName);
-      cy.restoreClusterToDefaultWorkspace(dsFirstClusterName, timeout);
-
-      // Delete the newly created workspace
-      cy.continuousDeliveryMenuSelection()
-      cy.continuousDeliveryWorkspacesMenu()
-      cy.filterInSearchBox(newWorkspaceName)
-      cy.deleteAll(false);
-    })
-  )
-});
-
 if (!/\/2\.11/.test(Cypress.env('rancher_version'))) {
   describe('Test HelmOps', { tags: '@p1_2' }, () => {
 

tests/cypress/e2e/unit_tests/special_fleet_tests.spec.ts

@@ -19,6 +19,11 @@ export const clusterName = "imported-0";
 export const branch = "main";
 export const path  = "nginx"
 export const sshString = ["Public key and private key for SSH", "Public key and private key for SSH authentication"]
+export const rancherVersion = Cypress.env('rancher_version')
+export const supported_versions_212_and_above = [
+  /^(prime|prime-optimus|prime-optimus-alpha|prime-alpha|prime-rc|alpha)\/2\.(1[2-9]|[2-9]\d+)(\..*)?$/,
+  /^head\/2\.(1[2-9])$/
+];
 
 beforeEach(() => {
 
@@ -118,6 +123,62 @@ describe('Agent Scheduling Customization', { tags: '@special_tests' }, () => {
   });
 };
 
+describe('Test move cluster to newly created workspace and deploy application to it.', { tags: '@special_tests'}, () => {
+  qase(51,
+    it("Fleet-51: Test move cluster to newly created workspace and deploy application to it.", { tags: '@fleet-51' }, () => {
+      const dsFirstClusterName = 'imported-0'
+      const repoName = 'default-cluster-new-workspace-51'
+      const branch = "master"
+      const path = "simple"
+      const repoUrl = "https://github.com/rancher/fleet-examples"
+      const flagName = "provisioningv2-fleet-workspace-back-population"
+      const newWorkspaceName = "new-fleet-workspace"
+      const fleetDefault = "fleet-default"
+      let timeout = 30000
+
+      //Version check for 2.12 (head)
+      if (supported_versions_212_and_above.some(r => r.test(rancherVersion))) {
+        timeout = 70000
+      }
+
+      // Enable cluster can move to another Fleet workspace feature flag.
+      cy.enableFeatureFlag(flagName);
+
+      // Create new workspace.
+      cy.createNewFleetWorkspace(newWorkspaceName);
+
+      // Switch to 'fleet-default' workspace
+      cy.fleetNamespaceToggle(fleetDefault);
+      cy.clickNavMenu(['Clusters']);
+
+      // Move first cluster i.e. 'imported-0' to newly created workspace.
+      cy.moveClusterToWorkspace(dsFirstClusterName, newWorkspaceName, timeout);
+
+      // Create a GitRepo targeting to cluster available in newly created workspace.
+      cy.addFleetGitRepo({ repoName, repoUrl, branch, path });
+      cy.fleetNamespaceToggle(newWorkspaceName);
+      cy.clickButton('Create');
+
+      // Review below line after all tests passed.
+      cy.checkGitRepoStatus(repoName, '1 / 1', '6 / 6');
+
+      // Delete GitRepo
+      // In Fleet Workspace, namespace name similarly treated as namespace.
+      cy.deleteAllFleetRepos(newWorkspaceName);
+
+      // Move cluster back to 'fleet-default' workspace
+      cy.fleetNamespaceToggle(newWorkspaceName);
+      cy.restoreClusterToDefaultWorkspace(dsFirstClusterName, timeout);
+
+      // Delete the newly created workspace
+      cy.continuousDeliveryMenuSelection()
+      cy.continuousDeliveryWorkspacesMenu()
+      cy.filterInSearchBox(newWorkspaceName)
+      cy.deleteAll(false);
+    })
+  )
+});
+
 // Note: to be executed after the above test cases
 // to avoid any interference (i.e: if continuous-delivery feature is not correctly enabled.)
 // To be replaced into other spec file when required.
@@ -128,6 +189,8 @@ describe("Global settings related tests", { tags: '@special_tests'}, () => {
 
         // Verify is gitrepoJobsCleanup is enabled by default.
         cy.accesMenuSelection('local', 'Workloads', 'CronJobs');
+        // Adding wait for CronJobs page to load correctly.
+        cy.wait(5000);
         cy.nameSpaceMenuToggle('All Namespaces');
         cy.verifyTableRow(0, 'Active', 'fleet-cleanup-gitrepo-jobs');
 
@@ -138,6 +201,8 @@ describe("Global settings related tests", { tags: '@special_tests'}, () => {
         cy.contains('Waiting for Restart', { timeout: 180000 }).should('not.exist');
         // Verify is gitrepoJobsCleanup job is not present
         cy.accesMenuSelection('local', 'Workloads', 'CronJobs');
+        // Adding wait for CronJobs page to load correctly.
+        cy.wait(5000);
         cy.contains('fleet-cleanup-gitrepo-jobs').should('not.exist');
 
         // Re-enable continuous-delivery feature flag and wait for restart.
@@ -147,6 +212,8 @@ describe("Global settings related tests", { tags: '@special_tests'}, () => {
         cy.contains('Waiting for Restart', { timeout: 180000 }).should('not.exist');
 
         cy.accesMenuSelection('local', 'Workloads', 'CronJobs');
+        // Adding wait for CronJobs page to load correctly.
+        cy.wait(5000);
         cy.nameSpaceMenuToggle('All Namespaces');
         cy.filterInSearchBox('fleet-cleanup-gitrepo-jobs');
         cy.verifyTableRow(0, 'Active', 'fleet-cleanup-gitrepo-jobs');