Skip to content

Commit

Permalink
Test using images from my branch
Browse files Browse the repository at this point in the history
  • Loading branch information
karencfv committed Feb 9, 2024
1 parent b554d99 commit 3ff45e9
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
12 changes: 6 additions & 6 deletions package-manifest.toml
Original file line number Diff line number Diff line change
Expand Up @@ -418,24 +418,24 @@ only_for_targets.image = "standard"
# 1. Build the zone image manually
# 2. Copy the output zone image from crucible/out to omicron/out
# 3. Use source.type = "manual" instead of "prebuilt"
source.type = "manual"
source.type = "prebuilt"
source.repo = "crucible"
source.commit = "2d4bc11232d53f177c286383926fa5f8c1b2a938"
source.commit = "3e2bd7c5f79b59c66d848a6c19042394c28616ff"
# The SHA256 digest is automatically posted to:
# https://buildomat.eng.oxide.computer/public/file/oxidecomputer/crucible/image/<commit>/crucible.sha256.txt
source.sha256 = "88ec93657a644e8f10a32d1d22cc027db901aea81027f49ce7bee58fc4a35755"
source.sha256 = "172c3ad4cbb836d6ef9af8d50a52eb6bc5fe7dad589b880c71a93bf9867a6188"
output.type = "zone"
output.intermediate_only = true

[package.crucible-pantry]
service_name = "crucible_pantry"
only_for_targets.image = "standard"
source.type = "manual"
source.type = "prebuilt"
source.repo = "crucible"
source.commit = "2d4bc11232d53f177c286383926fa5f8c1b2a938"
source.commit = "3e2bd7c5f79b59c66d848a6c19042394c28616ff"
# The SHA256 digest is automatically posted to:
# https://buildomat.eng.oxide.computer/public/file/oxidecomputer/crucible/image/<commit>/crucible-pantry.sha256.txt
source.sha256 = "e2c3ed2d4cd6b5da3d38dd52df6d4a259280be7d45c30a363e9c71b174ecc6f8"
source.sha256 = "6a90cb0e3198cc2578aa2f4aa75016fed8f25511ccd0965f1bf7e8872c156616"
output.type = "zone"
output.intermediate_only = true

Expand Down
3 changes: 2 additions & 1 deletion smf/sled-agent/non-gimlet/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ sidecar_revision.soft_zone = { front_port_count = 1, rear_port_count = 1 }

# Setting this to true causes sled-agent to always report that its time is
# in-sync, rather than querying its NTP zone.
skip_timesync = false
# TODO: DON'T FORGET TO SET BACK TO FALSE BEFORE MERGING
skip_timesync = true

# For testing purposes, A file-backed zpool can be manually created with the
# following:
Expand Down

0 comments on commit 3ff45e9

Please sign in to comment.