[4/n] [omicron-package] add and use target presets #7288
Merged
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
Created using spr 1.3.6-beta.1 [skip ci]
Created using spr 1.3.6-beta.1
Created using spr 1.3.6-beta.1 [skip ci]
sunshowers
added a commit
to oxidecomputer/omicron-package
that referenced
this pull request
Dec 21, 2024
Add a `target.preset` table which can be used to define presets for target configuration. This will be used within omicron-package. For how this will eventually be used, see oxidecomputer/omicron#7288.
sunshowers
changed the title
Created using spr 1.3.6-beta.1
Created using spr 1.3.6-beta.1 [skip ci]
Created using spr 1.3.6-beta.1
Created using spr 1.3.6-beta.1 [skip ci]
sunshowers
changed the title
smklein
reviewed
Jan 6, 2025
dev-tools/releng/src/main.rs
Outdated
Comment on lines
460
to
462
| // Note: Do not override the preset here! All release targets | ||
| // must be configured entirely via the `target.preset` table | ||
| // in `package-manifest.toml`. |
There was a problem hiding this comment.
This comment is about the --preset arg value above, not the env_remove call, right?
There was a problem hiding this comment.
Yes. I'll try making this clearer.
smklein
reviewed
Jan 6, 2025
Comment on lines
+949
to
+971
| [target.preset.host] | ||
| image = "standard" | ||
| machine = "gimlet" | ||
| switch = "asic" | ||
| rack-topology = "multi-sled" | ||
| clickhouse-topology = "single-node" | ||
|
|
||
| # A preset for the recovery image built during release. | ||
| [target.preset.recovery] | ||
| image = "trampoline" | ||
| # The trampoline image doesn't execute sled-agent and doesn't contain the switch | ||
| # zone, so neither "machine" nor "switch" are defined. | ||
| rack-topology = "single-sled" | ||
| clickhouse-topology = "single-node" | ||
|
|
||
| # A preset for development. | ||
| [target.preset.dev] | ||
| image = "standard" | ||
| machine = "non-gimlet" | ||
| switch = "softnpu" | ||
| rack-topology = "single-sled" | ||
| clickhouse-topology = "single-node" |
There was a problem hiding this comment.
This is great, I think it's very straightforward to see these defined here!
smklein
approved these changes
Jan 6, 2025
sunshowers
changed the base branch from
sunshowers/spr/main.3n-draft-omicron-package-add-and-use-target-presets
to
main
Created using spr 1.3.6-beta.1
sunshowers
commented
Jan 7, 2025
Comment on lines
+938
to
+971
| # Target configuration | ||
| # -------------------- | ||
| # | ||
| # This section defines "targets" built by Omicron. A target is a map of keys and | ||
| # values that are used to filter out packages (via `only_for_targets`) and for | ||
| # other purposes. | ||
| # | ||
| # For what the individual keys mean, see the definition for `TargetCommand` in | ||
| # `package/src/lib.rs`. | ||
|
|
||
| # A preset for the host image built during release. | ||
| [target.preset.host] | ||
| image = "standard" | ||
| machine = "gimlet" | ||
| switch = "asic" | ||
| rack-topology = "multi-sled" | ||
| clickhouse-topology = "single-node" | ||
|
|
||
| # A preset for the recovery image built during release. | ||
| [target.preset.recovery] | ||
| image = "trampoline" | ||
| # The trampoline image doesn't execute sled-agent and doesn't contain the switch | ||
| # zone, so neither "machine" nor "switch" are defined. | ||
| rack-topology = "single-sled" | ||
| clickhouse-topology = "single-node" | ||
|
|
||
| # A preset for development. | ||
| [target.preset.dev] | ||
| image = "standard" | ||
| machine = "non-gimlet" | ||
| switch = "softnpu" | ||
| rack-topology = "single-sled" | ||
| clickhouse-topology = "single-node" |
There was a problem hiding this comment.
All the presets are defined here.
sunshowers
deleted the
sunshowers/spr/3n-draft-omicron-package-add-and-use-target-presets
branch
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.
The overall goal of this change is to ensure that all release-related
configuration is present in
package-manifest.toml. This will allow linting and SBOMgeneration based on this config, rather than the knowledge being scattered
across omicron-package and the releng tool.
This depends on several other pieces of work: