OSModifier: Add kernel cmdline in EMU API and update extraCommandLine to a list #11080
Conversation
This file contains 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
cwize1
requested changes
Nov 16, 2024
elainezhao96
changed the title
elainezhao96
commented
Nov 21, 2024
| @@ -12,10 +12,10 @@ import ( | |||
| func TestIsoIsValid(t *testing.T) { | |||
There was a problem hiding this comment.
Should I delete this or not?
There was a problem hiding this comment.
You could use an empty string for the ExtraCommandLine item.
cwize1
requested changes
Nov 21, 2024
| @@ -12,10 +12,10 @@ import ( | |||
| func TestIsoIsValid(t *testing.T) { | |||
There was a problem hiding this comment.
You could use an empty string for the ExtraCommandLine item.
| @@ -6,18 +6,6 @@ import ( | |||
| "strings" | |||
There was a problem hiding this comment.
Is any of the other code in this file still being used? Can the whole file be deleted?
| @@ -215,14 +215,3 @@ func TestOSIsValidOverlayDuplicateWorkDir(t *testing.T) { | |||
| err := os.IsValid() | |||
| assert.ErrorContains(t, err, "duplicate workDir (/work_root) found in overlay at index 1") | |||
| } | |||
|
|
|||
| func TestOSIsValidInvalidKernelCommandLine(t *testing.T) { | |||
There was a problem hiding this comment.
Could this test be kept by using a empty string item?
| @@ -420,7 +423,8 @@ func (b *LiveOSIsoBuilder) updateGrubCfg(isoGrubCfgFileName string, pxeGrubCfgFi | |||
| } | |||
|
|
|||
| liveosKernelArgs := fmt.Sprintf(kernelArgsLiveOSTemplate, liveOSDir, liveOSImage) | |||
| additionalKernelCommandline := liveosKernelArgs + " " + string(savedConfigs.Iso.KernelCommandLine.ExtraCommandLine) | |||
| savedArgs := strings.Join(savedConfigs.Iso.KernelCommandLine.ExtraCommandLine, " ") | |||
| @@ -165,7 +166,7 @@ func TestCustomizeImageLiveCd1(t *testing.T) { | |||
| savedConfigs = &SavedConfigs{} | |||
| err = imagecustomizerapi.UnmarshalYamlFile(savedConfigsFilePath, savedConfigs) | |||
| assert.NoErrorf(t, err, "read (%s) file", savedConfigsFilePath) | |||
| assert.Equal(t, "rd.info rd.debug", string(savedConfigs.Iso.KernelCommandLine.ExtraCommandLine)) | |||
| assert.Equal(t, "rd.info rd.debug", strings.Join(savedConfigs.Iso.KernelCommandLine.ExtraCommandLine, " ")) | |||
There was a problem hiding this comment.
assert.Equal can compare lists.
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.
Merge Checklist
All boxes should be checked before merging the PR (just tick any boxes which don't apply to this PR)
Summary
What does the PR accomplish, why was it needed?
Add kernel cmdline in EMU API
related PR that updates trident: https://dev.azure.com/mariner-org/ECF/_git/trident/pullrequest/20937
Change Log
Does this affect the toolchain?
NO
Test Methodology