Fix builder resource flags being reset during builds - #2243
Open
nicoleman0 wants to merge 2 commits into
Open
nicoleman0 wants to merge 2 commits into
nicoleman0 wants to merge 2 commits into
Conversation
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
1 participant
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.
Type of Change
Motivation and Context
After
container builder start --cpus N --memory M, a latercontainer buildstarts the builder without resource flags. The omitted flags were resolved to theconfig.tomldefaults, causing the existing builder to be recreated with those defaults.Preserve the existing CPU or memory value when its flag is omitted. Explicit resource flags continue to replace the existing values. This also retains those resources when another setting, such as SSH forwarding, requires the builder to be recreated.
Fixes #2153.
Testing
Commands:
swift test --filter BuilderStartTests --skip-updateswift test --skip IntegrationTests --skip TestCLI --skip-update(773 tests)swift format lint --strict --configuration .swift-format-nolint Sources/ContainerCommands/Builder/BuilderStart.swift Tests/ContainerCommandsTests/BuilderStartTests.swift