Skip to content

Fix DataSource ResourceEditor restore missing pvc.namespace (CNV-98159) - #6607

Open
mijankow wants to merge 1 commit into
RedHatQE:cnv-4.18from
mijankow:CNV-98159-datasource-restore-user-backups
Open

mijankow wants to merge 1 commit into
RedHatQE:cnv-4.18from
mijankow:CNV-98159-datasource-restore-user-backups

Conversation

@mijankow

@mijankow mijankow commented Oct 15, 2026 •

Copy link
Copy Markdown
Contributor

Summary

  • Fix teardown 422 on TestDataSourcesOptOutLabel when ResourceEditor restores a partial DataSource backup without spec.source.pvc.namespace (CNV-98159).
  • Pass full pre-edit spec.source via user_backups and wait for reconcile before restore.

Test plan

@mijankow

Copy link
Copy Markdown
Contributor Author

/build-and-push-container

@coderabbitai

coderabbitai Bot commented Oct 15, 2026 •

Copy link
Copy Markdown
Contributor

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration
  • Configuration used: Repository UI
  • Review profile: CHILL
  • Plan: Advanced
  • Run ID: d5ece213-4b72-4528-9656-f1ff573f6f4e

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
  • Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@mijankow mijankow changed the title Fix DataSource ResourceEditor restore missing pvc.namespace (CNV-98159) [WIP] Fix DataSource ResourceEditor restore missing pvc.namespace (CNV-98159)-please do not review or merge yet Oct 15, 2026
@openshift-virtualization-qe-bot-4

Copy link
Copy Markdown

Report bugs in Issues

Welcome! 🎉

This pull request will be automatically processed with the following features:

🔄 Automatic Actions

  • Reviewer Assignment: Reviewers are automatically assigned based on the OWNERS file in the repository root
  • Size Labeling: PR size labels (XS, S, M, L, XL, XXL) are automatically applied based on changes
  • Issue Creation: A tracking issue is created for this PR and will be closed when the PR is merged or closed
  • Branch Labeling: Branch-specific labels are applied to track the target branch
  • Auto-verification: Auto-verified users have their PRs automatically marked as verified
  • Labels: Enabled categories: branch, can-be-merged, cherry-pick, has-conflicts, hold, size, verified, wip

📋 Available Commands

PR Status Management

  • /wip - Mark PR as work in progress (adds WIP: prefix to title)
  • /wip cancel - Remove work in progress status
  • /hold - Block PR merging (PR author or approvers)
  • /hold cancel - Unblock PR merging (PR author or approvers)
  • /verified - Mark PR as verified
  • /verified cancel - Remove verification status
  • /reprocess - Trigger complete PR workflow reprocessing (useful if webhook failed or configuration changed)
  • /regenerate-welcome - Regenerate this welcome message
  • /security-override - Set security check runs to pass (maintainers only)
  • /security-override cancel - Re-run security checks

Review & Approval

  • /lgtm - Approve changes (looks good to me)
  • /approve - Approve PR (approvers only)
  • /assign-reviewers - Assign reviewers based on OWNERS file
  • /assign-reviewer @username - Assign specific reviewer
  • /check-can-merge - Check if PR meets merge requirements

Testing & Validation

  • /retest tox - Run Python test suite with tox
  • /retest build-container - Rebuild and test container image
  • /retest verify-bugs-are-open - verify-bugs-are-open
  • /retest all - Run all available tests

Container Operations

  • /build-and-push-container - Build and push container image (tagged with PR number)
    • Supports additional build arguments: /build-and-push-container --build-arg KEY=value

Cherry-pick Operations

  • /cherry-pick <branch> - Schedule cherry-pick to target branch when PR is merged
    • Multiple branches: /cherry-pick branch1 branch2 branch3
  • /cherry-pick-retry <branch> - Retry a failed cherry-pick (merged PRs only)

Branch Management

  • /rebase - Rebase this PR branch onto its base branch

Label Management

  • /<label-name> - Add a label to the PR
  • /<label-name> cancel - Remove a label from the PR

✅ Merge Requirements

This PR will be automatically approved when the following conditions are met:

  1. Approval: /approve from at least one approver
  2. LGTM Count: Minimum 2 /lgtm from reviewers
  3. Status Checks: All required status checks must pass
  4. No Blockers: No wip, hold, has-conflicts labels and PR must be mergeable (no conflicts)
  5. Verified: PR must be marked as verified

📊 Review Process

Approvers and Reviewers

Approvers:

  • dshchedr
  • myakove
  • rnetser
  • vsibirsk

Reviewers:

  • RoniKishner
  • dshchedr
  • geetikakay
  • rnetser
  • vsibirsk
Available Labels
  • hold
  • verified
  • wip
  • lgtm
  • approve
AI Features
  • Cherry-Pick Conflict Resolution: Enabled (openai/gpt-5.6-luna)
Security Checks
  • Suspicious Path Detection: Monitors paths: .claude/, .vscode/, .cursor/, .devcontainer/, .pi/, .github/workflows/, .github/actions/
  • Committer Identity Check: Verifies last committer matches PR author
  • Mandatory: Security checks block merge (use /security-override to bypass — maintainers only)

💡 Tips

  • WIP Status: Use /wip when your PR is not ready for review
  • Verification: The verified label is removed on new commits unless the push is detected as a clean rebase
  • Cherry-picking: Cherry-pick labels are processed when the PR is merged
  • Container Builds: Container images are automatically tagged with the PR number
  • Permission Levels: Some commands require approver permissions
  • Auto-verified Users: Certain users have automatic verification and merge privileges

📌 Additional Information

Custom Commands:

  • /test-plan — Triggers CodeRabbit to analyze the PR's changed files and post a test execution plan
  • /rerun-smoke — Adds retest-smoke label on the PR to trigger smoke tests execution

For more information, please refer to the project documentation or contact the maintainers.

@mijankow mijankow changed the title [WIP] Fix DataSource ResourceEditor restore missing pvc.namespace (CNV-98159)-please do not review or merge yet Fix DataSource ResourceEditor restore missing pvc.namespace (CNV-98159)-please do not review or merge yet Oct 15, 2026
@mijankow

Copy link
Copy Markdown
Contributor Author

/wip

@openshift-virtualization-qe-bot-2 openshift-virtualization-qe-bot-2 changed the title Fix DataSource ResourceEditor restore missing pvc.namespace (CNV-98159)-please do not review or merge yet WIP: Fix DataSource ResourceEditor restore missing pvc.namespace (CNV-98159)-please do not review or merge yet Oct 15, 2026
@mijankow

Copy link
Copy Markdown
Contributor Author

/build-and-push-container

@openshift-virtualization-qe-bot-4

Copy link
Copy Markdown

New container for quay.io/openshift-cnv/openshift-virtualization-tests:pr-6607 published

1 similar comment
@openshift-virtualization-qe-bot-2

Copy link
Copy Markdown
Contributor

New container for quay.io/openshift-cnv/openshift-virtualization-tests:pr-6607 published

@mijankow
mijankow force-pushed the CNV-98159-datasource-restore-user-backups branch from 2a0f8fd to 867bf7b Compare October 16, 2026 08:32
@geetikakay

geetikakay commented Oct 16, 2026 •

Copy link
Copy Markdown
Contributor

@mijankow pls add Signed-off-by: , DCo fails for that

@mijankow

Copy link
Copy Markdown
Contributor Author

/wip cancel

@openshift-virtualization-qe-bot-6 openshift-virtualization-qe-bot-6 changed the title WIP: Fix DataSource ResourceEditor restore missing pvc.namespace (CNV-98159)-please do not review or merge yet Fix DataSource ResourceEditor restore missing pvc.namespace (CNV-98159)-please do not review or merge yet Oct 16, 2026
Use full pre-edit spec.source via user_backups so teardown restore does not
omit namespace after reconcile, avoiding API 422 on opt-out update tests.

Signed-off-by: Michal Jankowski <mijankow@redhat.com>
@mijankow
mijankow force-pushed the CNV-98159-datasource-restore-user-backups branch from 867bf7b to f7a40d9 Compare October 16, 2026 08:39
@mijankow mijankow changed the title Fix DataSource ResourceEditor restore missing pvc.namespace (CNV-98159)-please do not review or merge yet Fix DataSource ResourceEditor restore missing pvc.namespace (CNV-98159) Oct 16, 2026
@mijankow

Copy link
Copy Markdown
Contributor Author

@openshift-virtualization-qe-bot-6

Copy link
Copy Markdown

Clean rebase detected — no code changes compared to previous head (867bf7b).

@openshift-virtualization-qe-bot-3

Copy link
Copy Markdown
Contributor

@coderabbitai

Test execution plan request details

CRITICAL: You MUST post an inline review comment on the first changed line of the first file.
The inline comment should contain the full Test Execution Plan (smoke decision, gating decision, and specific affected tests).
Do NOT submit a blocking review event (REQUEST_CHANGES/APPROVE).
Post a single inline PR comment on Files Changed (non-blocking COMMENT flow).

As an expert software testing engineer, analyze all modified files in this PR and create a targeted test execution plan.
You will post an inline review comment with the test execution plan on the first changed file.
If you fail to run or post a comment, retry.

Analysis Requirements:

  1. Examine code changes in each modified file

  2. Identify affected code paths, functions, and classes

  3. Analyze pytest-specific elements: fixtures (scope, dependencies), parametrization, markers, conftest changes

  4. Trace test dependencies through imports, shared utilities, fixture inheritance, fixture teardown, and yield from cleanup in conftest

  5. Detect new tests introduced in the PR

  6. Utilities and libs impact (when utilities/ or libs/ changes):
    You MUST use shell scripts (rg, git diff) to trace the full impact.
    Follow these sub-steps in order:

    6a. Identify modified symbols: For each changed file under utilities/ or libs/,
    list every modified function or method.
    Example: git diff HEAD~1 --unified=0 -- utilities/hco.py | grep '^[+-]def '

    6b. Find direct callers: Search tests and conftest for each symbol from 6a.
    Example: rg -l 'get_hco_version' tests/

    6c. Trace fixture teardown and cleanup: Find fixtures that reach
    the modified symbol through yield from or context-manager wrappers.
    Example: rg -l 'yield from.*enable_common_boot|def.*enable_common_boot' tests/

    6d. Trace same-file callers: In each changed file, find other functions
    whose body calls a modified symbol (including code after yield
    in @contextmanager helpers).
    Example: rg 'get_hco_version|enable_common_boot' utilities/hco.py

    6e. Expand transitively: If function A calls modified B, then
    tests/fixtures that call A are affected — even when the test body
    never imports B directly.

    Do NOT limit impact to tests that import the modified symbol only.

  7. Smoke test impact: Intersect the affected set from step 6 with smoke-marked tests.
    Run: rg -l '@pytest.mark.smoke' tests/
    VERIFY the above command returned actual file paths before concluding False.
    Set True if either condition is met:

    • a smoke-marked file appears in the affected set from 6b-6e, OR
    • any conftest.py in the smoke test's parent-directory hierarchy (up to repo root)
      imports or calls a modified utilities/libs symbol — including autouse fixtures
      that depend on modified functions. ALL tests in that directory and below are affected.
      Example check: for each smoke_file, scan dirname(smoke_file)/conftest.py,
      dirname(dirname(smoke_file))/conftest.py, etc. for modified symbol imports
      and autouse fixtures that depend on modified symbols.
  8. Gating test impact: Intersect the affected set from step 6 with gating-marked tests.
    Run: rg -l '@pytest.mark.gating' tests/
    Set True if a gating-marked file also appears in the affected set from 6b-6e.
    Utilities/libs changes often affect gating tests without affecting smoke tests.
    Do NOT stop analysis after concluding Run smoke tests: False.

Output rules:
Do NOT include analysis step numbers (1-8) in your visible output.

Your deliverable:
Your inline informational comment will be based on the following requirements:

Test Execution Plan

  • Run smoke tests: True / False — If True, state the dependency path (test → fixture → changed symbol). True ONLY with a verified path.
  • Run gating tests: True / False — If True, state the dependency path. True if any gating-marked test is in the affected set.
  • Affected tests to run (required when utilities/, libs/, or shared conftest changes — list concrete paths even when smoke is False)

Use these formats:

  • path/to/test_file.py - When the entire test file needs verification
  • path/to/test_file.py::TestClass::test_method - When specific test(s) needed
  • path/to/test_file.py::test_function - When specific test(s) needed
  • -m marker - When a marker covers multiple affected tests (e.g. -m gating only if ALL gating tests in scope need run)
  • Tag each listed test or group with its marker when not obvious, e.g. (gating) or (smoke)

Real test commands (MANDATORY when changes affect session/runtime code):

When the affected code runs at session/collection time (conftest fixtures, pytest plugins,
config hooks, session-scoped setup) or modifies runtime behavior that unit tests mock away,
you MUST include concrete pytest commands the PR author must run on a real cluster
to verify the change works end-to-end. Include:

  • A command for the error/fix path (the scenario the PR fixes)
  • A command for the happy path (regression: the normal case still works)
  • Use lightweight tests (e.g., --collect-only for startup failures,
    a single small test for runtime behavior)
    If the PR only changes test logic (not utilities/libs/conftest), the affected test
    paths themselves serve as the real test commands — no separate section needed.

Example output for a session-startup fix:

**Real tests (cluster required)**
Error path (the fix):
`pytest tests/storage/.../test_foo.py --storage-class-matrix=nonexistent-sc --collect-only`
Expected: ValueError with clear message, not IndexError

Happy path (regression):
`pytest tests/storage/.../test_foo.py --storage-class-matrix=<valid-sc> -k test_bar`
Expected: session starts normally

Guidelines:

  • Include tests affected directly OR via fixture setup/teardown, yield from cleanup, or transitive utility call chains (caller calls modified helper)
  • Use a full file path only if ALL tests in that file require verification
  • Use file path + test name when only specific tests use an affected fixture or utility wrapper (preferred for partial file impact)
  • If a test marker can cover multiple files/tests, provide the marker
  • Balance coverage vs over-testing - Keep descriptions minimal
  • Example: if leaf helper foo() changes, include tests whose fixture teardown calls wrapper bar() where bar() calls foo(), even when the test body only imports an unrelated symbol from the same utilities module

Hardware-Related Checks (SR-IOV, GPU, DPDK):

When PR modifies fixtures for hardware-specific resources:

  • Collection Safety: Fixtures MUST have existence checks (return None when hardware unavailable)
  • Test Plan: MUST verify both WITH and WITHOUT hardware:
    • Run affected tests on cluster WITH hardware
    • Verify collection succeeds on cluster WITHOUT hardware

CRITICAL WORKFLOW COMPLETION RULES:

When responding to this test execution plan request, you MUST follow these rules EXACTLY:

  1. YOUR ONLY DELIVERABLE: Post one non-blocking inline comment containing the test execution plan on the first changed line
  2. THEN STOP IMMEDIATELY - Do NOT generate any additional response
  3. FALLBACK ONLY: If inline comment API calls fail after retrying, post as a regular PR comment
  4. SILENCE = SUCCESS: After successfully submitting the review, your task is complete. No confirmation needed.

ABSOLUTE PROHIBITIONS (violating these creates empty/meaningless reviews):

  • ❌ Do NOT post acknowledgment messages like "Test execution plan posted", "Review posted successfully", "I've successfully posted"
  • ❌ Do NOT mention review IDs, URLs, or confirmation of posting in the PR thread
  • ❌ Do NOT add any follow-up comments after submitting the review
  • ❌ Do NOT reply to confirm task completion
  • ❌ Do NOT explain what you did - just do it and stop

Remember: The pull request review is visible to users. Additional comments are redundant noise.

CRITICAL — Verification rules for smoke and gating decisions:
- For each True decision, you must have traced a concrete path: test file → fixture → utility function → modified symbol.
- Do NOT assume impact based on scope, file proximity, or infrastructure-sounding names.
Only set True when you trace a concrete path through steps 6a-6e, then 7 or 8.
WRONG: "utilities/hco.py changed → run smoke" (no traced dependency path)
WRONG: "Run smoke tests: False" with no affected-test list when gating tests use the changed utility
RIGHT: "Run smoke tests: False, Run gating tests: True" plus tests/.../test_foo.py::TestBar::test_baz (gating)
RIGHT: "Smoke test X uses fixture Y → wrapper Z → changed function W in utilities/hco.py"

@coderabbitai

coderabbitai Bot commented Oct 16, 2026

Copy link
Copy Markdown
Contributor

Tip

For best results, initiate chat on the files or code changes.

🧩 Analysis chain

🏁 Script executed:

#!/bin/bash
set -euo pipefail
gh pr diff 6607 --repo RedHatQE/openshift-virtualization-tests
printf '\n--- PR HEAD ---\n'
gh pr view 6607 --repo RedHatQE/openshift-virtualization-tests --json headRefOid,baseRefName,files
printf '\n--- LOCAL HEAD ---\n'
git rev-parse HEAD
printf '\n--- SMOKE FILES ---\n'
rg -l '@pytest.mark.smoke' tests/ || true
printf '\n--- GATING FILES ---\n'
rg -l '@pytest.mark.gating' tests/ || true

Length of output: 7355


🏁 Script executed:

#!/bin/bash
set -euo pipefail
file=tests/infrastructure/golden_images/update_boot_source/test_ssp_data_sources.py
ast-grep outline "$file" --items all
printf '\n--- CHANGED HELPER REFERENCES ---\n'
rg -n -C4 '\bupdate_data_source\b|TestDataSourcesOptOutLabel' --type py .
printf '\n--- FILE CONTENT ---\n'
sed -n '1,440p' "$file"
printf '\n--- PARENT CONFTEST FILES ---\n'
for dir in . tests tests/infrastructure tests/infrastructure/golden_images tests/infrastructure/golden_images/update_boot_source; do
  if [ -f "$dir/conftest.py" ]; then
    ast-grep outline "$dir/conftest.py" --items all
  fi
done
printf '\n--- MARKER CONFIG FILES ---\n'
fd -i '^(pytest\.ini|pyproject\.toml|setup\.cfg|tox\.ini)$'

Length of output: 51455


🏁 Script executed:

#!/bin/bash
set -euo pipefail
printf '\n--- REMAINING TESTS ---\n'
sed -n '430,710p' tests/infrastructure/golden_images/update_boot_source/test_ssp_data_sources.py
printf '\n--- FIXTURE CONSUMERS ---\n'
rg -n -C2 '\b(updated_opted_in_data_source_scope_function|updated_opted_out_data_source_scope_function|updated_data_source_with_existing_pvc_scope_function)\b' --type py .
printf '\n--- LOCAL CONFTEST ---\n'
sed -n '1,135p' tests/infrastructure/golden_images/update_boot_source/conftest.py
sed -n '1,55p' tests/infrastructure/golden_images/conftest.py
printf '\n--- MARKER HOOKS ---\n'
sed -n '63,88p' conftest.py
sed -n '340,430p' conftest.py
sed -n '463,528p' conftest.py
printf '\n--- PYTEST CONFIG ---\n'
cat pytest.ini
printf '\n--- DOCUMENTED RUN OPTIONS ---\n'
rg -n -C2 'pytest |test-config|tc-file|--tc|--post-upgrade' README.md tox.ini conftest.py | head -150

Length of output: 41345


@openshift-virtualization-qe-bot-3 Inline posting is unavailable through the provided read-only capabilities. The plan below is for tests/infrastructure/golden_images/update_boot_source/test_ssp_data_sources.py, Line 20, the first changed line.

Test Execution Plan

  • Run smoke tests: False — Verified smoke-marked files have no dependency on the changed module-local helper or its fixtures.
  • Run gating tests: False — Verified gating-marked files have no dependency on the changed helper or its fixtures.
  • Scope: Only update_data_source and its constant import changed. No utilities, libraries, or conftest files changed. No new tests were added.

Affected tests to run

All listed tests have the post_upgrade marker:

  • tests/infrastructure/golden_images/update_boot_source/test_ssp_data_sources.py::test_opt_in_data_source_reconciles_after_update
  • tests/infrastructure/golden_images/update_boot_source/test_ssp_data_sources.py::test_opt_out_data_source_reconciles_after_update
  • tests/infrastructure/golden_images/update_boot_source/test_ssp_data_sources.py::TestDataSourcesOptInLabel::test_opt_in_label_data_source_reconciles_after_update_with_existing_pvc
  • tests/infrastructure/golden_images/update_boot_source/test_ssp_data_sources.py::TestDataSourcesOptOutLabel::test_opt_out_label_data_source_reconciles_after_update_with_existing_pvc

The standalone tests reach update_data_source through updated_opted_in_data_source_scope_function and updated_opted_out_data_source_scope_function. Both class methods reach it through updated_data_source_with_existing_pvc_scope_function. Each fixture yields inside the context manager, so fixture teardown executes the changed wait and restore.

Include each class's dependency prerequisite:

  • TestDataSourcesOptInLabel::test_opt_in_label_data_source_when_pvc_exists
  • TestDataSourcesOptOutLabel::test_remove_data_source_dic_label_when_pvc_exists

Both classes use the configured TESTS_AUTO_UPDATE_BOOT_SOURCE_NAME through indirect parametrization. Keep the existing class-scoped feature-gate, DataVolume, and label setup and cleanup.

Real tests — cluster required

Use the cluster's normal kubeconfig and test configuration. Run serially because these tests modify shared golden-image resources.

Error path — CNV-98159:

pytest tests/infrastructure/golden_images/update_boot_source/test_ssp_data_sources.py::TestDataSourcesOptOutLabel \
  -k 'test_remove_data_source_dic_label_when_pvc_exists or test_opt_out_label_data_source_reconciles_after_update_with_existing_pvc'

Expected: Both tests pass, including teardown. Restore includes the original source namespace and produces no API 422 error.

Happy path — opt-in and feature-gate-disabled regression:

pytest \
  tests/infrastructure/golden_images/update_boot_source/test_ssp_data_sources.py::test_opt_in_data_source_reconciles_after_update \
  tests/infrastructure/golden_images/update_boot_source/test_ssp_data_sources.py::test_opt_out_data_source_reconciles_after_update \
  tests/infrastructure/golden_images/update_boot_source/test_ssp_data_sources.py::TestDataSourcesOptInLabel \
  -k 'reconciles_after_update or test_opt_in_label_data_source_when_pvc_exists'

Expected: All four selected tests pass, including teardown. Confirm that restore retains the original source name and namespace. Where supported, repeat with PVC-backed and snapshot-backed sources to cover both helper branches.

Cluster execution was not performed in this environment.

You are interacting with an AI system.

@openshift-virtualization-qe-bot

Copy link
Copy Markdown

New container for quay.io/openshift-cnv/openshift-virtualization-tests:pr-6607 published

This branch has not been deployed

No deployments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants