Fix Upgrade Test: fleet-agent pod name change and individual Fleet Upgrade version check (#303)

* Fix upgrade failing test

Signed-off-by: Satyajit Bulage <[email protected]>

* Added individual check for each images

* Added debugging print statement to see 3 images

Signed-off-by: Satyajit Bulage <[email protected]>

---------

Signed-off-by: Satyajit Bulage <[email protected]>

Author: sbulage

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

@@ -154,8 +154,8 @@ describe('Test "fleet-agent" image version on each downstream cluster',  { tags:
           cy.accesMenuSelection(dsCluster, 'Workloads', 'Pods');
           cy.nameSpaceMenuToggle('All Namespaces');
           cy.filterInSearchBox('fleet-agent');
-          cy.verifyTableRow(0, 'Running', 'fleet-agent-0');
-          cy.contains('fleet-agent-0').click();
+          cy.verifyTableRow(0, 'Running', 'fleet-agent');
+          cy.contains('fleet-agent').click();
           cy.wait(500);
           cy.clickButton('Config');
 

tests/e2e/upgrade_test.go

@@ -119,11 +119,28 @@ var _ = Describe("E2E - Upgrading Rancher Manager", Label("upgrade-rancher-manag
 			// and check that it's different to the version before upgrade
 			fleetVersionAfterUpgrade, err := kubectl.RunWithoutErr(getFleetImageVersion...)
 
+			// Parse the versions from the images
+			beforeUpgradeImages := strings.Fields(fleetVersionBeforeUpgrade)
+			afterUpgradeImages := strings.Fields(fleetVersionAfterUpgrade)
+
 			// Get after-upgrade Fleet version and check that it's different from the before-upgrade version
 			// getFleetImageVersion output consists of 3 fleet images,
 			// so we're checking 3 images must be present there.
 			g.Expect(err).To(Not(HaveOccurred()))
 			g.Expect(len(strings.Fields(fleetVersionAfterUpgrade))).To(Equal(3))
+
+			// Check version of the first image
+			fmt.Println("First Fleet image after upgrade:", afterUpgradeImages[0]) // Debugging output
+			g.Expect(beforeUpgradeImages[0]).To(Not(Equal(afterUpgradeImages[0])))
+
+			// Check version of the second image
+			fmt.Println("Second Fleet image after upgrade:", afterUpgradeImages[1]) // Debugging output
+			g.Expect(beforeUpgradeImages[1]).To(Not(Equal(afterUpgradeImages[1])))
+
+			// Check version of the third image
+			fmt.Println("Third Fleet image after upgrade:", afterUpgradeImages[2]) // Debugging output
+			g.Expect(beforeUpgradeImages[2]).To(Not(Equal(afterUpgradeImages[2])))
+
 			fmt.Println("Current Fleet version after upgrade:", fleetVersionAfterUpgrade) // Debugging output
 			g.Expect(fleetVersionAfterUpgrade).To(Not(Equal(fleetVersionBeforeUpgrade)))
 	}, tools.SetTimeout(10*time.Minute), 20*time.Second).Should(Succeed())