Skip to content

Conversation

redbeam
Copy link
Contributor

@redbeam redbeam commented Jul 4, 2025

9P support for filesharing on Windows: crc-org/crc#4168

Summary by Sourcery

Enhancements:

  • Enable mskvarla/9pfs COPR repository and download the 9pfs package in createdisk.sh when generating Windows bundles

Summary by CodeRabbit

  • New Features

    • When creating a Windows bundle, the build now pre-downloads and stages the 9p file-sharing package so it’s available for later installation in the VM, improving Windows 9p support.
  • Chores

    • Improved package preparation flow for Windows bundle creation and clarified comments about which pre-downloaded and additional packages are not installed in the guest.

@redbeam redbeam self-assigned this Jul 4, 2025
Copy link

sourcery-ai bot commented Jul 4, 2025

Reviewer's Guide

This PR enhances the createdisk.sh script to support 9P file sharing on Windows by adding steps that enable a COPR repository and download the 9pfs binary via SSH when generating the Windows bundle, then include it in the installation list.

Flow diagram for 9P FUSE client installation in createdisk.sh

flowchart TD
    A[Start createdisk.sh] --> B{Is SNC_GENERATE_WINDOWS_BUNDLE != 0?}
    B -- No --> C[Continue without 9pfs setup]
    B -- Yes --> D[Enable COPR repo mskvarla/9pfs via SSH]
    D --> E[Create ~/packages directory via SSH]
    E --> F[Download 9pfs package to ~/packages via SSH]
    F --> G[Add 9pfs to ADDITIONAL_PACKAGES]
    G --> H[Continue with install_additional_packages]
    C --> H
    H[Install additional packages and copy systemd units]
Loading

File-Level Changes

Change Details Files
Add logic to install 9pfs during Windows bundle creation
  • Guard installation steps with SNC_GENERATE_WINDOWS_BUNDLE check
  • Enable mskvarla/9pfs COPR repository on the VM
  • Download the 9pfs package into a local directory
  • Append '9pfs' to ADDITIONAL_PACKAGES for installation
createdisk.sh

Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

Copy link

coderabbitai bot commented Jul 4, 2025

Walkthrough

The createdisk.sh script was updated to, when generating a Windows bundle, enable the mskvarla/9pfs COPR repo, download the 9pfs package into a local directory, disable the COPR repo, and add 9pfs to PRE_DOWNLOADED_ADDITIONAL_PACKAGES.

Changes

Cohort / File(s) Change Summary
Disk creation script
createdisk.sh
Added conditional logic for Windows bundle generation: enable COPR mskvarla/9pfs, download 9pfs to local cache, disable the COPR repo, and append 9pfs to PRE_DOWNLOADED_ADDITIONAL_PACKAGES. Comment updated to include PRE_DOWNLOADED_ADDITIONAL_PACKAGES.

Sequence Diagram(s)

sequenceDiagram
  autonumber
  participant DevEnv as create-disk script
  participant COPR as COPR (mskvarla/9pfs)
  participant Cache as Local cache dir
  participant VMPrep as install_additional_packages step

  rect rgb(230, 248, 255)
    DevEnv->>COPR: enable repo (if Windows bundle)
    DevEnv->>COPR: dnf download 9pfs --downloaddir=Cache
    COPR-->>DevEnv: provide 9pfs package
    DevEnv->>COPR: disable repo
    DevEnv->>DevEnv: append '9pfs' to PRE_DOWNLOADED_ADDITIONAL_PACKAGES
  end

  DevEnv->>VMPrep: call install_additional_packages (uses pre-downloaded packages)
Loading

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~10 minutes

Possibly related issues

  • 9P File sharing crc#4858 — Matches intent to pre-download 9pfs from mskvarla/9pfs COPR for inclusion in Windows bundle; this PR implements that pre-download step.

Poem

A rabbit hopped in bash and cheer,
Enabled COPR to fetch what’s near,
Saved 9pfs for Windows’ share,
Cached it neatly with careful care,
Now disks are built with files to spare. 🐇

Pre-merge checks and finishing touches

✅ Passed checks (3 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title Check ✅ Passed The title succinctly indicates the addition of the 9p fuse client, which matches the core enhancement implemented in createdisk.sh for Windows bundle support. It uses clear and consistent terminology that aligns with the PR objectives and code changes. The phrasing is concise and specific enough to inform readers of the main change at a glance.
Docstring Coverage ✅ Passed No functions found in the changes. Docstring coverage check skipped.
✨ Finishing touches
  • 📝 Generate docstrings
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Post copyable unit tests in a comment
  • Commit unit tests in branch add_9p_fuse_client

📜 Recent review details

Configuration used: CodeRabbit UI

Review profile: CHILL

Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between ebb66cd and fc6975d.

📒 Files selected for processing (1)
  • createdisk.sh (1 hunks)
🚧 Files skipped from review as they are similar to previous changes (1)
  • createdisk.sh

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 and usage tips.

@openshift-ci openshift-ci bot requested review from anjannath and cfergeau July 4, 2025 12:18
Copy link

openshift-ci bot commented Jul 4, 2025

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign gbraad for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

Copy link

@sourcery-ai sourcery-ai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey @redbeam - I've reviewed your changes and they look great!


Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

@redbeam redbeam changed the title add 9p fuse client 9p: add 9p fuse client Jul 4, 2025
Copy link

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 1

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 60549d2 and 089c041.

📒 Files selected for processing (1)
  • createdisk.sh (1 hunks)

@redbeam redbeam moved this to Hold in Project planning: crc Jul 4, 2025
@redbeam
Copy link
Contributor Author

redbeam commented Jul 4, 2025

/hold

@redbeam redbeam force-pushed the add_9p_fuse_client branch 2 times, most recently from ce67106 to ab5803b Compare July 9, 2025 13:09
@redbeam redbeam force-pushed the add_9p_fuse_client branch 2 times, most recently from a737705 to ebb66cd Compare July 16, 2025 09:32
@redbeam redbeam mentioned this pull request Aug 6, 2025
1 task
@redbeam
Copy link
Contributor Author

redbeam commented Aug 6, 2025

/unhold

@redbeam redbeam moved this from Hold to Ready for review in Project planning: crc Aug 6, 2025
@anjannath
Copy link
Member

/test e2e-snc

@praveenkumar
Copy link
Member

@redbeam both commit should be squashed because you are replacing container build binary to rpm based one.

This adds the necessary steps for installation of the 9pfs client
to the hyperv image. The binary is installed from a COPR repository.
This binary is needed to enable 9P file sharing.
@redbeam redbeam force-pushed the add_9p_fuse_client branch from ebb66cd to fc6975d Compare October 4, 2025 00:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Ready for review

Development

Successfully merging this pull request may close these issues.

3 participants