From 0afcfdf82e5e09f82daa5a1f3e25cbfa4b0f4912 Mon Sep 17 00:00:00 2001 From: asc5543 Date: Thu, 15 Jan 2026 09:52:10 +0800 Subject: [PATCH 1/2] Add RKE1 decrecate condition to skip test cases Signed-off-by: asc5543 --- harvester_e2e_tests/fixtures/rancher_api_client.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/harvester_e2e_tests/fixtures/rancher_api_client.py b/harvester_e2e_tests/fixtures/rancher_api_client.py index 64a4b03ba..a7f5d53ba 100644 --- a/harvester_e2e_tests/fixtures/rancher_api_client.py +++ b/harvester_e2e_tests/fixtures/rancher_api_client.py @@ -46,6 +46,9 @@ def _pickup_k8s_version(versions, target_version): @pytest.fixture(scope='session') def rke1_version(request, rancher_api_client, harvester_metadata): + if rancher_api_client.cluster_version >= parse_version("v2.12.0"): + pytest.skip(reason=f"Rancher version {rancher_api_client.cluster_version} matches RKE1 has reached EOL condition(s) in v2.12.0") + target_ver = request.config.getoption("--k8s-version") code, data = rancher_api_client.settings.get("k8s-versions-current") From f4df08a2f30eeed6885f1dff93a3458837ea6202 Mon Sep 17 00:00:00 2001 From: asc5543 Date: Thu, 15 Jan 2026 09:57:43 +0800 Subject: [PATCH 2/2] Fix PEP8 error Signed-off-by: asc5543 --- harvester_e2e_tests/fixtures/rancher_api_client.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/harvester_e2e_tests/fixtures/rancher_api_client.py b/harvester_e2e_tests/fixtures/rancher_api_client.py index a7f5d53ba..76daba8e4 100644 --- a/harvester_e2e_tests/fixtures/rancher_api_client.py +++ b/harvester_e2e_tests/fixtures/rancher_api_client.py @@ -47,7 +47,8 @@ def _pickup_k8s_version(versions, target_version): @pytest.fixture(scope='session') def rke1_version(request, rancher_api_client, harvester_metadata): if rancher_api_client.cluster_version >= parse_version("v2.12.0"): - pytest.skip(reason=f"Rancher version {rancher_api_client.cluster_version} matches RKE1 has reached EOL condition(s) in v2.12.0") + pytest.skip(reason=f"Rancher version {rancher_api_client.cluster_version} " + "matches RKE1 has reached EOL condition(s) in v2.12.0") target_ver = request.config.getoption("--k8s-version")