Revert Updated existing 2.7 CI job testing purpose

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

.github/workflows/master-e2e.yaml

@@ -68,6 +68,10 @@ on:
         description: Rancher Manager channel/version/head_version to use for installation
         default: stable/latest/none
         type: string
+      upgrade:
+        description: Proceed with Rancher Upgrade (True/False)
+        default: true
+        type: boolean
       rancher_upgrade:
         description: Rancher Manager channel/version to upgrade to
         type: string
@@ -329,14 +333,34 @@ jobs:
             # Export values
             echo "rancher_image_version=${RANCHER_VERSION}" >> ${GITHUB_OUTPUT}
 
-            # Check application
-            make e2e-check-app
           else
             # Needed to be sure that Github Action will see the failure
             false
           fi
+      - name: Extract component versions/informations after Upgrade
+        id: upgraded_component
+        run: |
+          # Extract Rancher Manager version
+          RM_UPGRADED_VERSION=$(kubectl get pod \
+            --namespace cattle-system \
+            -l app=rancher \
+            -o jsonpath={.items[*].status.containerStatuses[*].image} 2> /dev/null || true)
+          # Extract Fleet App version and images from local cluster
+          FLEET_APP_UPGRADED_VERSION="$(helm list -n cattle-fleet-system -o json 2> /dev/null \
+            | jq -r '.[] | .chart' \
+            | sort -V \
+            | uniq \
+            | tail -n 2 \
+            | head -n 1)"
+          for ns in {cattle-fleet-system,cattle-fleet-local-system}; do
+            FLEET_UPGRADED_IMAGES+="$(kubectl get pods -n $ns -o jsonpath='{.items[*].spec.containers[*].image}' 2> /dev/null) "
+          done
+          # Export values
+          echo "rm_upgraded_version=${RM_UPGRADED_VERSION}" >> ${GITHUB_OUTPUT}
+          echo "fleet_app_upgraded_version=${FLEET_APP_UPGRADED_VERSION}" >> ${GITHUB_OUTPUT}
+          echo "fleet_images_after_upgrade=${FLEET_UPGRADED_IMAGES}" >> ${GITHUB_OUTPUT}
       - name: Cypress tests - On Upgraded Rancher
-        id: rancher_upgrade
+        id: cypress_result_after_rancher_upgrade
         if: ${{ inputs.rancher_upgrade != '' }}
         env:
           BROWSER: chrome
@@ -355,6 +379,7 @@ jobs:
           RSA_PRIVATE_KEY_QA: ${{ secrets.rsa_private_key_qa }}
           RSA_PUBLIC_KEY_QA: ${{ secrets.rsa_public_key_qa }}
           GREPTAGS: ${{ inputs.grep_test_by_tag }}
+          UPGRADE: ${{ inputs.upgrade }}
           SPEC: |
             cypress/e2e/unit_tests/first_login_rancher.spec.ts
             cypress/e2e/unit_tests/p0_fleet.spec.ts
@@ -406,8 +431,12 @@ jobs:
           echo "K3s version for Rancher Manager: ${{ env.INSTALL_K3S_VERSION }}" >> ${GITHUB_STEP_SUMMARY}
           echo "K3d version for downstream cluster: ${{ env.INSTALL_K3S_VERSION }}" >> ${GITHUB_STEP_SUMMARY}
           if ${{ inputs.rancher_upgrade != '' }}; then
-            echo "# Rancher Manager Upgrade Information" >> ${GITHUB_STEP_SUMMARY}
-            echo "Rancher Manager Upgraded Version: ${{ inputs.rancher_upgrade }}" >> ${GITHUB_STEP_SUMMARY}
+            echo "### Rancher Manager Upgrade Information" >> ${GITHUB_STEP_SUMMARY}
+            echo "Rancher Manager Installed Version: ${{ inputs.rancher_version }}" >> ${GITHUB_STEP_SUMMARY}
+            echo "Rancher Manager Upgraded Version: ${{ steps.upgraded_component.outputs.rm_upgraded_version }}" >> ${GITHUB_STEP_SUMMARY}
+            echo "### Fleet (After Upgrade)" >> ${GITHUB_STEP_SUMMARY}
+            echo "Fleet App version: ${{ steps.upgraded_component.outputs.fleet_app_upgraded_version }}" >> ${GITHUB_STEP_SUMMARY}
+            echo "Fleet images in local cluster: ${{ steps.upgraded_component.outputs.fleet_images_after_upgrade }}" >> ${GITHUB_STEP_SUMMARY}
           fi
 
   delete-runner:

.github/workflows/ui-rm_head_2.7.yaml

@@ -1,5 +1,5 @@
 # This workflow calls the master E2E workflow with custom variables
-name: UI-RM_head_2.7
+name: UI-RM_head_upgrade
 run-name: ${{ github.event_name == 'workflow_dispatch' && format('`{0}` on `{1}` - `{2}` destroy={3}', inputs.rancher_version, inputs.upstream_cluster_version, inputs.grep_test_by_tag, inputs.destroy_runner) || github.workflow }}
 
 on:
@@ -14,13 +14,23 @@ on:
         default: true
         type: boolean
       rancher_version:
-        description: Rancher version channel/version/head_version latest/latest, latest/2.7.10[-rc2], prime/2.7.12, prime/devel/2.7, prime-optimus/2.7.13-rc4
-        default: latest/devel/2.7
+        description: Rancher version channel/version/head_version latest/latest, latest/2.y.x[-rc1], prime/2.y.x, prime/devel/2.y, alpha/2.y.0-alphaZ
+        default: latest/devel/2.9
         type: string
         required: true
+      upgrade:
+        description: Proceed with Rancher Upgrade (True/False)
+        default: true
+        required: true
+        type: boolean
+      rancher_upgrade:
+        description: Rancher Manager channel/version to upgrade to
+        default: latest/devel/2.10
+        required: true
+        type: string
       upstream_cluster_version:
         description: K3s upstream cluster version where to install Rancher
-        default: v1.26.10+k3s2
+        default: v1.28.8+k3s1
         type: string
         required: true
       grep_test_by_tag:
@@ -50,9 +60,10 @@ jobs:
     with:
       test_description: "CI/Manual - UI - Deployment test with Standard K3s"
       cluster_name: cluster-k3s
-      # WARNING, VALUES BELOW ARE HARDCODED FOR RUNS SCHEDULED BY CRON
       destroy_runner: ${{ github.event_name == 'schedule' && true || inputs.destroy_runner }}
-      upstream_cluster_version: ${{ inputs.upstream_cluster_version || 'v1.26.10+k3s2' }}
-      rancher_version: ${{ inputs.rancher_version || 'latest/devel/2.7' }}
-      qase_run_id: ${{ inputs.qase_run_id || 'auto' }}
-      grep_test_by_tag: ${{ inputs.grep_test_by_tag || '@login @p0 @p1 @rbac' }}
+      upstream_cluster_version: ${{ inputs.upstream_cluster_version }}
+      rancher_version: ${{ inputs.rancher_version }}
+      rancher_upgrade: ${{ inputs.rancher_upgrade }}
+      upgrade: ${{ inputs.upgrade }}
+      qase_run_id: ${{ inputs.qase_run_id }}
+      grep_test_by_tag: ${{ inputs.grep_test_by_tag }}

.github/workflows/ui-rm_head_upgrade.yaml

@@ -18,6 +18,11 @@ on:
         default: latest/devel/2.9
         type: string
         required: true
+      upgrade:
+        description: Proceed with Rancher Upgrade (True/False)
+        default: true
+        required: true
+        type: boolean
       rancher_upgrade:
         description: Rancher Manager channel/version to upgrade to
         default: latest/devel/2.10
@@ -33,8 +38,6 @@ on:
         required: false
         type: string
         default: '@login @p0 @p1 @rbac'
-  schedule:
-    - cron: '30 4 * * *'
 
 jobs:
   ui:
@@ -57,10 +60,10 @@ jobs:
     with:
       test_description: "CI/Manual - UI - Deployment test with Standard K3s"
       cluster_name: cluster-k3s
-      # WARNING, VALUES BELOW ARE HARDCODED FOR RUNS SCHEDULED BY CRON
       destroy_runner: ${{ github.event_name == 'schedule' && true || inputs.destroy_runner }}
-      upstream_cluster_version: ${{ inputs.upstream_cluster_version || 'v1.28.8+k3s1' }}
-      rancher_version: ${{ inputs.rancher_version || 'latest/devel/2.9' }}
-      rancher_upgrade: ${{ inputs.rancher_upgrade || 'latest/devel/2.10' }}
-      qase_run_id: ${{ inputs.qase_run_id || 'auto' }}
-      grep_test_by_tag: ${{ inputs.grep_test_by_tag || '@login @p0 @p1 @rbac' }}
+      upstream_cluster_version: ${{ inputs.upstream_cluster_version }}
+      rancher_version: ${{ inputs.rancher_version }}
+      rancher_upgrade: ${{ inputs.rancher_upgrade }}
+      upgrade: ${{ inputs.upgrade }}
+      qase_run_id: ${{ inputs.qase_run_id }}
+      grep_test_by_tag: ${{ inputs.grep_test_by_tag }}

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

@@ -23,7 +23,7 @@ export const path  = "nginx"
 beforeEach(() => {
   cy.login();
   cy.visit('/');
-  cy.deleteAllFleetRepos();
+  // cy.deleteAllFleetRepos();
 });
 
 Cypress.config();
@@ -196,15 +196,17 @@ describe('Test gitrepos with cabundle', { tags: '@p0' }, () => {
   );  
 
   qase(144,
-    it("Fleet-144 Test cabundle secrets are not created without TLS certificate", { tags: '@fleet-144' }, () => {;
+    it.only("Fleet-144 Test cabundle secrets are not created without TLS certificate", { tags: '@fleet-144' }, () => {;
 
       const repoName = 'local-144-test-cabundle-secrets-not-created'
       const repoUrl = 'https://github.com/rancher/fleet-examples'
       const branch = 'master'
       const path = 'simple'
-
+      const upgrade = Cypress.env('upgrade')
+      // Remove this line after upgrade PR.
+      cy.accesMenuSelection('Continuous Delivery', 'Git Repos');
       cy.fleetNamespaceToggle('fleet-local');
-      cy.addFleetGitRepo({ repoName, repoUrl, branch, path });
+      cy.addFleetGitRepo({ repoName, repoUrl, branch, path, upgrade });
       cy.clickButton('Create');
       cy.verifyTableRow(0, 'Active', '1/1');
       cy.accesMenuSelection('local', 'Storage', 'Secrets');

tests/cypress/support/commands.ts

@@ -84,8 +84,12 @@ Cypress.Commands.add('importYaml', ({ clusterName, yamlFilePath }) => {
 
 // Command add and edit Fleet Git Repository
 // TODO: Rename this command name to 'addEditFleetGitRepo'
-Cypress.Commands.add('addFleetGitRepo', ({ repoName, repoUrl, branch, path, path2, gitOrHelmAuth, gitAuthType, userOrPublicKey, pwdOrPrivateKey, tlsOption, tlsCertificate, keepResources, correctDrift, fleetNamespace='fleet-local', editConfig=false, helmUrlRegex, deployToTarget }) => {
+Cypress.Commands.add('addFleetGitRepo', ({ repoName, repoUrl, branch, path, path2, gitOrHelmAuth, gitAuthType, userOrPublicKey, pwdOrPrivateKey, tlsOption, tlsCertificate, keepResources, correctDrift, fleetNamespace='fleet-local', editConfig=false, helmUrlRegex, deployToTarget, upgrade=false}) => {
   cy.accesMenuSelection('Continuous Delivery', 'Git Repos');
+  if (upgrade === true) {
+    cy.fleetNamespaceToggle(fleetNamespace);
+    cy.verifyTableRow(0, /Active|Modified/, repoName);
+  }
   if (editConfig === true) {
     cy.fleetNamespaceToggle(fleetNamespace);
     cy.verifyTableRow(0, /Active|Modified/, repoName);

tests/cypress/support/e2e.ts

@@ -23,7 +23,7 @@ declare global {
       open3dotsMenu(name: string, selection?: string, checkNotInMenu?: boolean): Chainable<Element>;
       addPathOnGitRepoCreate(path: string, index?: number): Chainable<Element>;
       gitRepoAuth(AuthType: string, userOrPublicKey?: string, pwdOrPrivateKey?: string, gitOrHelmAuth?: string, helmUrlRegex?: string): Chainable<Element>;
-      addFleetGitRepo(repoName: string, repoUrl?: string, branch?: string, path?: string, path2?: string, fleetNamespace?: string, editConfig?: boolean, helmUrlRegex?: string, deployToTarget?: string, tlsOption?: string, tlsCertificate?: string ): Chainable<Element>;
+      addFleetGitRepo(repoName: string, repoUrl?: string, branch?: string, path?: string, path2?: string, fleetNamespace?: string, editConfig?: boolean, helmUrlRegex?: string, deployToTarget?: string, tlsOption?: string, tlsCertificate?: string, upgrade?: boolean): Chainable<Element>;
       fleetNamespaceToggle(toggleOption: string): Chainable<Element>;
       verifyTableRow(rowNumber: number, expectedText1?: string|RegExp, expectedText2?: string|RegExp): Chainable<Element>;
       nameSpaceMenuToggle(namespaceName: string): Chainable<Element>;

tests/e2e/upgrade_test.go

@@ -15,6 +15,7 @@ limitations under the License.
 package e2e_test
 
 import (
+	"fmt"
 	"strings"
 	"time"
 
@@ -46,6 +47,16 @@ var _ = Describe("E2E - Upgrading Rancher Manager", Label("upgrade-rancher-manag
 		versionBeforeUpgrade, err := kubectl.RunWithoutErr(getImageVersion...)
 		Expect(err).To(Not(HaveOccurred()))
 
+		// Get Fleet Version before-upgrade
+		getFleetImageVersion := []string{"get", "pod",
+		"--namespace", "cattle-fleet-system",
+		"-l", "app=fleet-controller",
+		"-o", "jsonpath={.items[*].status.containerStatuses[*].image}",
+		}
+
+		// Execute the shell command to get version before upgrade
+		fleetVersionBeforeUpgrade, err := kubectl.RunWithoutErr(getFleetImageVersion...)
+
 		// Upgrade Rancher Manager
 		// NOTE: Don't check the status, we can have false-positive here...
 		//       Better to check the rollout after the upgrade, it will fail if the upgrade failed
@@ -90,5 +101,40 @@ var _ = Describe("E2E - Upgrading Rancher Manager", Label("upgrade-rancher-manag
 		versionAfterUpgrade, err := kubectl.RunWithoutErr(getImageVersion...)
 		Expect(err).To(Not(HaveOccurred()))
 		Expect(versionAfterUpgrade).To(Not(Equal(versionBeforeUpgrade)))
+
+		// Function to check if all Fleet pods are updated and running the new version
+		isFleetControllerUpgradeComplete := func() bool {
+			// Check the rollout status of Fleet pods to ensure they are updated
+			rolloutStatus, err := kubectl.RunWithoutErr(
+				"rollout",
+				"--namespace", "cattle-fleet-system",
+				"status", "deployment/fleet-controller",
+			)
+			if err != nil {
+					return false
+			}
+
+			// Check if the rollout has completed successfully
+			return strings.Contains(rolloutStatus, `deployment "fleet-controller" successfully rolled out`)
+		}
+
+		// Wait for the upgrade to complete by checking if the Fleet rollout is complete
+		Eventually(isFleetControllerUpgradeComplete, tools.SetTimeout(10*time.Minute), 20*time.Second).Should(BeTrue())
+
+		// Get after-upgrade Fleet version
+		// and check that it's different to the before-upgrade version
+		Eventually(func() int {
+			fleetCmdOut, _ := kubectl.RunWithoutErr(getFleetImageVersion...)
+			return len(strings.Fields(fleetCmdOut))
+		}, tools.SetTimeout(5*time.Minute), 10*time.Second).Should(Equal(3))
+
+		// Get Fleet version after upgrade
+		// and check that it's different to the version before upgrade
+		Eventually(func() string {
+			fleetVersionAfterUpgrade, err := kubectl.RunWithoutErr(getFleetImageVersion...)
+			Expect(err).To(Not(HaveOccurred()))
+			fmt.Println("Current Fleet version after upgrade:", fleetVersionAfterUpgrade) // Debugging output
+			return fleetVersionAfterUpgrade
+		}, 10*time.Minute, 5*time.Second).Should(Not(Equal(fleetVersionBeforeUpgrade)))
 	})
 })

tests/scripts/start-cypress-tests

@@ -27,6 +27,7 @@ docker run --init -v $PWD:/workdir -w /workdir              \
     -e "RSA_PUBLIC_KEY_QA=$RSA_PUBLIC_KEY_QA"               \
     -e "GREP=$GREP"                                         \
     -e "GREPTAGS=$GREPTAGS"                                 \
+    -e "UPGRADE=$UPGRADE"                                   \
     --add-host host.docker.internal:host-gateway            \
     --ipc=host                                              \
     $CYPRESS_DOCKER                                         \