Merge branch 'main' into fleetqa/bumping-dependencies

rancher · Jan 29, 2025 · 53b7b38 · 53b7b38
2 parents 3164c6b + 0db9ce3
commit 53b7b38
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 10 deletions.
diff --git a/.github/workflows/ui-rm_head.yaml b/.github/workflows/ui-rm_head.yaml
@@ -20,7 +20,7 @@ on:
         required: true
       upstream_cluster_version:
         description: K3s upstream cluster version where to install Rancher
-        default: v1.30.3+k3s1
+        default: 'v1.30.8+k3s1'
         type: string
         required: true
       grep_test_by_tag:
@@ -54,7 +54,7 @@ jobs:
       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.30.3+k3s1' }}
+      upstream_cluster_version: ${{ inputs.upstream_cluster_version || 'v1.30.8+k3s1' }}
       rancher_version: ${{ inputs.rancher_version || 'latest/devel/head' }}
       qase_run_id: ${{ inputs.qase_run_id || 'auto' }}
       grep_test_by_tag: ${{ inputs.grep_test_by_tag || '@login @p0 @p1 @rbac' }}
diff --git a/.github/workflows/ui-rm_head_2.10.yaml b/.github/workflows/ui-rm_head_2.10.yaml
@@ -20,7 +20,7 @@ on:
         required: true
       upstream_cluster_version:
         description: K3s upstream cluster version where to install Rancher
-        default: v1.28.8+k3s1
+        default: 'v1.30.8+k3s1'
         type: string
         required: true
       grep_test_by_tag:
@@ -54,7 +54,7 @@ jobs:
       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' }}
+      upstream_cluster_version: ${{ inputs.upstream_cluster_version || 'v1.30.8+k3s1' }}
       rancher_version: ${{ inputs.rancher_version || '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' }}
diff --git a/.github/workflows/ui-rm_head_2.9.yaml b/.github/workflows/ui-rm_head_2.9.yaml
@@ -20,7 +20,7 @@ on:
         required: true
       upstream_cluster_version:
         description: K3s upstream cluster version where to install Rancher
-        default: v1.28.8+k3s1
+        default: 'v1.29.12+k3s1'
         type: string
         required: true
       grep_test_by_tag:
@@ -54,7 +54,7 @@ jobs:
       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' }}
+      upstream_cluster_version: ${{ inputs.upstream_cluster_version || 'v1.29.12+k3s1' }}
       rancher_version: ${{ inputs.rancher_version || 'latest/devel/2.9' }}
       qase_run_id: ${{ inputs.qase_run_id || 'auto' }}
       grep_test_by_tag: ${{ inputs.grep_test_by_tag || '@login @p0 @p1 @rbac' }}
diff --git a/.github/workflows/ui-rm_prime_alpha_rc.yaml b/.github/workflows/ui-rm_prime_alpha_rc.yaml
@@ -19,8 +19,8 @@ on:
         type: string
         required: true
       upstream_cluster_version:
-        description: K3s upstream cluster version where to install Rancher
-        default: 'v1.28.8+k3s1'
+        description: K3s upstream cluster version where to install Rancher (change this to 'v1.30.8+k3s1' when use 2.10 onwards)
+        default: 'v1.29.12+k3s1'
         type: string
         required: true
       grep_test_by_tag:
@@ -50,7 +50,6 @@ 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: ${{ inputs.destroy_runner }}
       upstream_cluster_version: ${{ inputs.upstream_cluster_version }}
       rancher_version: ${{ inputs.rancher_version }}

diff --git a/tests/cypress/e2e/unit_tests/rbac_fleet.spec.ts b/tests/cypress/e2e/unit_tests/rbac_fleet.spec.ts
@@ -945,7 +945,7 @@ describe('Test GitRepoRestrictions scenarios for GitRepo applicaiton deployment.
 // 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.
-describe("Global settings related tests", { tags: '@rback'}, () => {
+describe("Global settings related tests", { tags: '@rbac'}, () => {
   if (!/\/2\.7/.test(Cypress.env('rancher_version')) && !/\/2\.8/.test(Cypress.env('rancher_version'))) {
     qase(156,
       it("Fleet-156: Test gitrepoJobsCleanup is disabled when continuous-delivery feature is off", { tags: '@fleet-156' }, () => {