Skip to content

RHOAIENG-76664: use codeflare-sdk post-upgrade on 2.25 with fix and not run pre_upgrade if upgrade to version is 3.x #2992

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pawelpaszki merged 1 commit into from
Jul 16, 2026
Merged

RHOAIENG-76664: use codeflare-sdk post-upgrade on 2.25 with fix and not run pre_upgrade if upgrade to version is 3.x #2992

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ods_ci/tests/Resources/Files/kueue-batch-user-role.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
rules:
- apiGroups: [""]
resources: ["namespaces"]
verbs: ["create", "get", "list", "watch"]
verbs: ["create", "get", "list", "watch", "delete"]
- apiGroups: ["kueue.x-k8s.io"]
resources: ["clusterqueues", "resourceflavors", "localqueues"]
verbs: ["create", "get", "list", "watch", "update", "patch", "delete"]
Expand Down
31 changes: 17 additions & 14 deletions ods_ci/tests/Resources/Page/DistributedWorkloads/DistributedWorkloads.resource
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Resource ../../../../tasks/Resources/RHODS_OLM/install/oc_install.robot


*** Variables ***
${CODEFLARE-SDK-RELEASE-TAG} v0.31.3
${CODEFLARE-SDK-RELEASE-TAG} v0.31.6-sdk-test-fix
${CODEFLARE-SDK_DIR} codeflare-sdk
${CODEFLARE-SDK_REPO_URL} %{CODEFLARE-SDK_REPO_URL=https://github.com/project-codeflare/codeflare-sdk.git}
${DISTRIBUTED_WORKLOADS_RELEASE_ASSETS} https://github.com/opendatahub-io/distributed-workloads/releases/latest/download
Expand Down Expand Up @@ -65,16 +65,28 @@ Prepare Codeflare-SDK Test Setup
# Perform oc login with Test User
Login To OCP Using API ${TEST_USER.USERNAME} ${TEST_USER.PASSWORD}

Skip Codeflare-SDK Pre Upgrade If Upgrade Target Is 3x
[Documentation] Skips codeflare-sdk pre-upgrade when UPGRADE_TO_VERSION targets RHOAI 3.x or greater. That path is covered by shift-left container tests (pre on 2.25 image).
${upgrade_to_version}= Get Variable Value ${UPGRADE_TO_VERSION} ${EMPTY}
IF '${upgrade_to_version}' == '${EMPTY}'
RETURN
END
${is_upgrade_to_3x_or_greater}= Evaluate int("${upgrade_to_version}".split(".")[0]) >= 3
Skip If ${is_upgrade_to_3x_or_greater}
... msg=Skipping codeflare-sdk pre-upgrade: UPGRADE_TO_VERSION is ${upgrade_to_version} (shift-left covers 2.25->3.x pre-upgrade)

Prepare Codeflare-SDK Pre Upgrade Test Setup
[Documentation] Prepare codeflare-sdk pre-upgrade tests; skip when upgrade target is 3.x
Skip Codeflare-SDK Pre Upgrade If Upgrade Target Is 3x
Prepare Codeflare-SDK Upgrade Test Setup

Prepare Codeflare-SDK Upgrade Test Setup
[Documentation] Prepare codeflare-sdk upgrade tests with RBAC setup and namespace creation
[Documentation] Prepare codeflare-sdk upgrade tests with RBAC setup
Clone Git Repository ${CODEFLARE-SDK_REPO_URL} ${CODEFLARE-SDK-RELEASE-TAG} ${CODEFLARE-SDK_DIR}

# Setup Kueue RBAC permissions as admin before switching to test user
Setup Kueue Batch User RoleBinding

# Create the test namespace as admin
Create Test Namespace For Codeflare Test

# Perform oc login with Test User
Login To OCP Using API ${TEST_USER.USERNAME} ${TEST_USER.PASSWORD}

Expand Down Expand Up @@ -124,15 +136,6 @@ Cleanup Codeflare-SDK Setup
# Cleanup Kueue RBAC resources
Teardown Kueue Batch User RoleBinding

Create Test Namespace For Codeflare Test
[Documentation] Create the test namespace as admin for codeflare tests
Log To Console "Creating test namespace test-ns-rayupgrade as admin"
${rc}= Run And Return Rc oc create namespace test-ns-rayupgrade

IF ${rc} != 0
Log To Console "Warning: Unable to create namespace test-ns-rayupgrade (may already exist)"
END

Prepare Training Operator KFTO E2E Test Suite
[Documentation] Prepare Training Operator KFTO E2E Test Suite
Prepare Training Operator E2E Test Suite ${KFTO_BINARY_NAME}
Expand Down
2 changes: 1 addition & 1 deletion ods_ci/tests/Tests/0200__rhoai_upgrade/0201__pre_upgrade.robot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ Verify Distributed Workload Metrics Resources By Creating Ray Cluster Workload
# robocop: off=too-many-calls-in-test-case
[Documentation] Creates the Ray Cluster and verify resource usage
[Tags] Upgrade WorkloadOrchestration
[Setup] Prepare Codeflare-SDK Upgrade Test Setup
[Setup] Prepare Codeflare-SDK Pre Upgrade Test Setup
${PRJ_UPGRADE}= Set Variable test-ns-rayupgrade
${JOB_NAME}= Set Variable mnist
Run Codeflare-SDK Test
Expand Down
3 changes: 2 additions & 1 deletion ...istributed_workloads/0601__workloads_orchestration/test-run-codeflare-sdk-e2e-tests.robot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Run TestRayLocalInteractiveOauth test with Python 3.11
Run TestHeterogenousClustersOauth
[Documentation] Run Python E2E test: TestHeterogenousClustersOauth (workaround for 2.15)
[Tags]
... Tier1
... deprecatedTest
... DistributedWorkloads
... WorkloadsOrchestration
... HeterogeneousCluster
Expand All @@ -41,6 +41,7 @@ Run TestHeterogenousClustersOauth
*** Keywords ***
Prepare Codeflare-sdk E2E Test Suite
[Documentation] Prepare codeflare-sdk E2E Test Suite
Setup Kueue Batch User RoleBinding
Prepare Codeflare-SDK Test Setup
RHOSi Setup

Expand Down
Loading