ci/ui: fix rke2 ui upgrade test

Author: juadk

.github/workflows/ui-rke2-upgrade-matrix.yaml

@@ -37,8 +37,8 @@ jobs:
       fail-fast: false
       max-parallel: 4
       matrix:
-        k8s_downstream_version: ${{ fromJSON(format('[{0}]', inputs.k8s_downstream_version || '"v1.30.4+rke2r1"')) }}
-        k8s_upstream_version: ${{ fromJSON(format('[{0}]', inputs.k8s_upstream_version || '"v1.30.4+rke2r1"')) }}
+        k8s_downstream_version: ${{ fromJSON(format('[{0}]', inputs.k8s_downstream_version || '"v1.30.6+rke2r1"')) }}
+        k8s_upstream_version: ${{ fromJSON(format('[{0}]', inputs.k8s_upstream_version || '"v1.30.6+rke2r1"')) }}
         rancher_version: ${{ fromJSON(format('[{0}]', inputs.rancher_version || '"prime/latest","latest/devel/2.9","latest/devel/2.10"')) }}
     uses: ./.github/workflows/master_e2e.yaml
     secrets:

tests/cypress/latest/support/commands.ts

@@ -392,5 +392,5 @@ Cypress.Commands.add('addOsVersionChannel', (channelVersion: string) => {
   cy.wait(10000);
 
   // Make sure the new channel is in Active state
-  cy.contains("Active " + channelVersion + "-channel", { timeout: 50000 });
+  cy.contains(new RegExp('Active.*'+channelVersion+'-channel'), { timeout: 50000 });
 });

tests/cypress/latest/support/utils.ts

@@ -66,6 +66,13 @@ export const createCluster = (clusterName: string, k8sVersion: string, proxy: st
     .type('My Elemental testing cluster');
   cy.contains('.labeled-input.create', 'Machine Count')
     .clear()
+  // Do not use Calico for RKE2 2.10, there is a bug
+  if (isK8sVersion('rke2') && isRancherManagerVersion('2.10')) {
+    cy.getBySel('cluster-rke2-cni-select')
+      .click();
+    cy.contains('canal')
+      .click();
+  }
   if (isCypressTag('main')) {
     cy.contains('.labeled-input.create', 'Machine Count')
       .type('3');