Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Add rootfs partition name in gen2 market place image#5505

Merged
miz060 merged 2 commits into
microsoft:mainfrom
miz060:mitchzhu/add_partlabel
May 19, 2023
Merged

Add rootfs partition name in gen2 market place image#5505
miz060 merged 2 commits into
microsoft:mainfrom
miz060:mitchzhu/add_partlabel

Conversation

@miz060

@miz060 miz060 commented May 15, 2023 •
edited
Loading

Copy link
Copy Markdown
Member
Merge Checklist

All boxes should be checked before merging the PR (just tick any boxes which don't apply to this PR)

  • The toolchain has been rebuilt successfully (or no changes were made to it)
  • The toolchain/worker package manifests are up-to-date
  • Any updated packages successfully build (or no packages were changed)
  • Packages depending on static components modified in this PR (Golang, *-static subpackages, etc.) have had their Release tag incremented.
  • Package tests (%check section) have been verified with RUN_CHECK=y for existing SPEC files, or added to new SPEC files
  • All package sources are available
  • cgmanifest files are up-to-date and sorted (./cgmanifest.json, ./toolkit/scripts/toolchain/cgmanifest.json, .github/workflows/cgmanifest.json)
  • LICENSE-MAP files are up-to-date (./SPECS/LICENSES-AND-NOTICES/data/licenses.json, ./SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md, ./SPECS/LICENSES-AND-NOTICES/LICENSE-EXCEPTIONS.PHOTON)
  • All source files have up-to-date hashes in the *.signatures.json files
  • sudo make go-tidy-all and sudo make go-test-coverage pass
  • Documentation has been updated to match any changes to the build system
  • Ready to merge
Summary

Add rootfs partition name in gen2 market place image to enable kata image's grub.cfg to find mshv-bootloader file.

Change Log
  • Add rootfs partition name in amd64 gen2 market place image
  • Add rootfs partition name in aarch64 gen2 market place image (for future images only)
Does this affect the toolchain?

NO

Test Methodology

@miz060 miz060 changed the base branch from 2.0 to main May 15, 2023 23:03
@miz060 miz060 changed the title Add rootfs partlabel to market place image Add rootfs partlabel to gen2 market place image May 15, 2023
@miz060 miz060 changed the title Add rootfs partlabel to gen2 market place image Add rootfs partlabel in gen2 market place image May 15, 2023
@miz060 miz060 self-assigned this May 15, 2023
@microsoft-github-policy-service microsoft-github-policy-service Bot added the main PR Destined for main label May 15, 2023
@miz060 miz060 marked this pull request as ready for review May 15, 2023 23:15
@miz060 miz060 requested a review from a team as a code owner May 15, 2023 23:15
@Camelron

Camelron commented May 15, 2023

Copy link
Copy Markdown

lgtm

christopherco
christopherco requested changes May 16, 2023
View reviewed changes

@christopherco christopherco left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

This change has the potential to impact all of our Azure VM use cases, so I'd like to make sure this is fully reviewed and tested before merging. Requesting a few reviews from a few additional devs.

And can we get run results for this change through LISAv3/Penguinator?

hbeberman
hbeberman requested changes May 16, 2023
View reviewed changes
Comment thread toolkit/imageconfigs/marketplace-gen2.json Outdated
@dmcilvaney

dmcilvaney commented May 16, 2023

Copy link
Copy Markdown
Contributor

I'm wondering if we should split this into a dedicated image definition. While it might be unlikely anyone has taken a depenency on the exact formatting of the marketplace fstab file I'm leery of changing it mid-release.

Two options off the top of my head:

  1. We split a dedicated base image with this change and take the hit in infrastructure needed to build/test/release it.
  2. Take just the "name": ... change (which will make the partition labelled) but make the change to the fstab/boot arg in Packer.

I'm leaning towards 2) for now until we do our next major release where we can switch stuff up.

@miz060

miz060 commented May 16, 2023 •
edited
Loading

Copy link
Copy Markdown
Member Author

I'm wondering if we should split this into a dedicated image definition. While it might be unlikely anyone has taken a depenency on the exact formatting of the marketplace fstab file I'm leery of changing it mid-release.

Two options off the top of my head:

  1. We split a dedicated base image with this change and take the hit in infrastructure needed to build/test/release it.
  2. Take just the "name": ... change (which will make the partition labelled) but make the change to the fstab/boot arg in Packer.

I'm leaning towards 2) for now until we do our next major release where we can switch stuff up.

Thanks for the suggestion Daniel! I figured out the packer change to make things work with only the partition name and no partlabel. Just reverted the partlabel change.

@miz060 miz060 changed the title Add rootfs partlabel in gen2 market place image Add rootfs partition name in gen2 market place image May 16, 2023
christopherco
christopherco requested changes May 18, 2023
View reviewed changes

@christopherco christopherco left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Changes LGTM. Just looking for Penguinator results for these latest changes to be added.

@miz060

miz060 commented May 18, 2023

Copy link
Copy Markdown
Member Author

Changes LGTM. Just looking for Penguinator results for these latest changes to be added.

This is the LISAv3 passing run with this change:
https://penguinatorstarter.powerappsportals.com/mytests/myjobs/testdetails/?id=ff58d86f-ccf5-ed11-a81c-6045bdb1047c

@miz060 miz060 merged commit 455608b into microsoft:main May 19, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@hbeberman hbeberman hbeberman approved these changes

@christopherco christopherco christopherco approved these changes

@Camelron Camelron Camelron approved these changes

@ddstreet ddstreet Awaiting requested review from ddstreet

@jslobodzian jslobodzian Awaiting requested review from jslobodzian

@dmcilvaney dmcilvaney Awaiting requested review from dmcilvaney

@chalamalasetty chalamalasetty Awaiting requested review from chalamalasetty

Assignees

@miz060 miz060

Labels

main PR Destined for main

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@miz060 @Camelron @dmcilvaney @hbeberman @christopherco