[CP 1553] fix(tests): clean up orphaned DRA DeviceClass before GPU Operator hel…#585
Open
ci-penbot-01 wants to merge 1 commit into
Conversation
…… (#1553) * fix(tests): clean up orphaned DRA DeviceClass before GPU Operator helm install Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * fix(tests): clean up orphaned DRA DeviceClass and stale DRA helm release before migration test Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> --------- Co-authored-by: Vyoma Sadhu <vysadhu@SCSVYSADHU01.amd.com> Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com> (cherry picked from commit 147890957cc264243122da812b6189ad2dfc98dc)
Contributor
Author
AI-Assisted Cherry-PickSource PR: #1553 The cherry-pick operation encountered merge conflicts which were resolved automatically using AI assistance. Files with conflicts (resolved by AI):
Original conflict in tests/pytests/k8/conftest.py<<<<<<< ours (deleted)
=======
for api_version in ("v1", "v1beta2", "v1beta1"):
ret_code, _, _ = k8_util.k8_delete_custom_resource("resource.k8s.io", api_version, "deviceclasses", "", "gpu.amd.com")
if ret_code == 0:
Logger.warning("Deleted pre-existing DeviceClass 'gpu.amd.com' before helm install")
break
>>>>>>> 14789095 (fix(tests): clean up orphaned DRA DeviceClass before GPU Operator hel… (#1553))Original conflict in tests/pytests/k8/dra-driver/test_dra_migration.py<<<<<<< ours (deleted)
=======
# DRA sanity tests (test_dra_driver_uninstall) reinstall the DRA chart at teardown.
# Uninstall it here so Step 2's helm_install does not fail with "release already exists".
if helm_util.is_helm_chart_deployed(gpu_cluster, dra_driver_release_name, dra_driver_namespace):
Logger.warning(f"Stale DRA release '{dra_driver_release_name}' found — uninstalling before migration test")
ret_code, _, ret_stderr = helm_util.helm_uninstall(gpu_cluster, dra_driver_release_name, dra_driver_namespace)
if ret_code != 0:
helm_util.helm_cleanup(gpu_cluster, dra_driver_release_name, dra_driver_namespace)
>>>>>>> 14789095 (fix(tests): clean up orphaned DRA DeviceClass before GPU Operator hel… (#1553))Cherry-pick triggered by: ACP-Automation |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
cp of pensando/gpu-operator#1553