Skip to content

Commit

Permalink
Chore: Bump OPTE to v0.34.301. (#7109)
Browse files Browse the repository at this point in the history
Brings in the `ingot`-based perf work, so that we can get some miles on
it prior to the R12 release candidate. This PR also updates maghemite to
the latest version, as part of an OPTE API version bump.
  • Loading branch information
FelixMcFelix authored Nov 21, 2024
1 parent e951652 commit e289427
Show file tree
Hide file tree
Showing 9 changed files with 87 additions and 28 deletions.
4 changes: 2 additions & 2 deletions .github/buildomat/jobs/deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#:
#: name = "helios / deploy"
#: variety = "basic"
#: target = "lab-2.0-opte-0.33"
#: target = "lab-2.0-opte-0.34"
#: output_rules = [
#: "%/var/svc/log/oxide-sled-agent:default.log*",
#: "%/zone/oxz_*/root/var/svc/log/oxide-*.log*",
Expand Down Expand Up @@ -136,7 +136,7 @@ z_swadm () {

# only set this if you want to override the version of opte/xde installed by the
# install_opte.sh script
OPTE_COMMIT="f3002b356da7d0e4ca15beb66a5566a92919baaa"
OPTE_COMMIT=""
if [[ "x$OPTE_COMMIT" != "x" ]]; then
curl -sSfOL https://buildomat.eng.oxide.computer/public/file/oxidecomputer/opte/module/$OPTE_COMMIT/xde
pfexec rem_drv xde || true
Expand Down
77 changes: 68 additions & 9 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -443,8 +443,8 @@ macaddr = { version = "1.0.1", features = ["serde_std"] }
maplit = "1.0.2"
mockall = "0.13"
newtype_derive = "0.1.6"
mg-admin-client = { git = "https://github.com/oxidecomputer/maghemite", rev = "056283eb02b6887fbf27f66a215662520f7c159c" }
ddm-admin-client = { git = "https://github.com/oxidecomputer/maghemite", rev = "056283eb02b6887fbf27f66a215662520f7c159c" }
mg-admin-client = { git = "https://github.com/oxidecomputer/maghemite", rev = "93cd0d642cf1b58f9f4528275e2a2aa758e9feb3" }
ddm-admin-client = { git = "https://github.com/oxidecomputer/maghemite", rev = "93cd0d642cf1b58f9f4528275e2a2aa758e9feb3" }
multimap = "0.10.0"
nexus-auth = { path = "nexus/auth" }
nexus-client = { path = "clients/nexus-client" }
Expand Down Expand Up @@ -488,7 +488,7 @@ omicron-test-utils = { path = "test-utils" }
omicron-workspace-hack = "0.1.0"
omicron-zone-package = "0.11.1"
oxide-client = { path = "clients/oxide-client" }
oxide-vpc = { git = "https://github.com/oxidecomputer/opte", rev = "f3002b356da7d0e4ca15beb66a5566a92919baaa", features = [ "api", "std" ] }
oxide-vpc = { git = "https://github.com/oxidecomputer/opte", rev = "98247c27846133a80fdb8f730f0c57e72d766561", features = [ "api", "std" ] }
oxlog = { path = "dev-tools/oxlog" }
oxnet = { git = "https://github.com/oxidecomputer/oxnet" }
once_cell = "1.20.2"
Expand All @@ -498,7 +498,7 @@ openapiv3 = "2.0.0"
# must match samael's crate!
openssl = "0.10"
openssl-sys = "0.9"
opte-ioctl = { git = "https://github.com/oxidecomputer/opte", rev = "f3002b356da7d0e4ca15beb66a5566a92919baaa" }
opte-ioctl = { git = "https://github.com/oxidecomputer/opte", rev = "98247c27846133a80fdb8f730f0c57e72d766561" }
oso = "0.27"
owo-colors = "4.1.0"
oximeter = { path = "oximeter/oximeter" }
Expand Down
12 changes: 6 additions & 6 deletions package-manifest.toml
Original file line number Diff line number Diff line change
Expand Up @@ -637,10 +637,10 @@ source.repo = "maghemite"
# `tools/maghemite_openapi_version`. Failing to do so will cause a failure when
# building `ddm-admin-client` (which will instruct you to update
# `tools/maghemite_openapi_version`).
source.commit = "056283eb02b6887fbf27f66a215662520f7c159c"
source.commit = "93cd0d642cf1b58f9f4528275e2a2aa758e9feb3"
# The SHA256 digest is automatically posted to:
# https://buildomat.eng.oxide.computer/public/file/oxidecomputer/maghemite/image/<commit>/mg-ddm-gz.sha256.txt
source.sha256 = "973fc43ed3b0727d72e3493339e1fdb69e7cb2767ee4aa27f65c4a2da8f8126b"
source.sha256 = "5265f638b0ad4bd640113d4c8a30215388c695e7084db9c6cc113f5e350086fb"
output.type = "tarball"

[package.mg-ddm]
Expand All @@ -653,10 +653,10 @@ source.repo = "maghemite"
# `tools/maghemite_openapi_version`. Failing to do so will cause a failure when
# building `ddm-admin-client` (which will instruct you to update
# `tools/maghemite_openapi_version`).
source.commit = "056283eb02b6887fbf27f66a215662520f7c159c"
source.commit = "93cd0d642cf1b58f9f4528275e2a2aa758e9feb3"
# The SHA256 digest is automatically posted to:
# https://buildomat.eng.oxide.computer/public/file/oxidecomputer/maghemite/image/<commit>/mg-ddm.sha256.txt
source.sha256 = "ed60620a32a35a6885064e7c777369d5092455cd5c1aa240672dfaac05c31f56"
source.sha256 = "b0b1b96d76cf179313305aa85857e469dd76d90e1c075305b72bd3675ef9538e"
output.type = "zone"
output.intermediate_only = true

Expand All @@ -668,10 +668,10 @@ source.repo = "maghemite"
# `tools/maghemite_openapi_version`. Failing to do so will cause a failure when
# building `ddm-admin-client` (which will instruct you to update
# `tools/maghemite_openapi_version`).
source.commit = "056283eb02b6887fbf27f66a215662520f7c159c"
source.commit = "93cd0d642cf1b58f9f4528275e2a2aa758e9feb3"
# The SHA256 digest is automatically posted to:
# https://buildomat.eng.oxide.computer/public/file/oxidecomputer/maghemite/image/<commit>/mgd.sha256.txt
source.sha256 = "7c10ac7d284ce78e70e652ad91bebf3fee7a2274ee403a09cc986c6ee73cf1eb"
source.sha256 = "9db633384abe06f23c2b396c4beda3e34ec9bf74d538a914eb57198f6ba8992e"
output.type = "zone"
output.intermediate_only = true

Expand Down
2 changes: 1 addition & 1 deletion tools/maghemite_ddm_openapi_version
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
COMMIT="056283eb02b6887fbf27f66a215662520f7c159c"
COMMIT="93cd0d642cf1b58f9f4528275e2a2aa758e9feb3"
SHA2="007bfb717ccbc077c0250dee3121aeb0c5bb0d1c16795429a514fa4f8635a5ef"
4 changes: 2 additions & 2 deletions tools/maghemite_mg_openapi_version
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
COMMIT="056283eb02b6887fbf27f66a215662520f7c159c"
SHA2="28389b4a5fb5d9767b518aacdd09470135aefa2f6704a3b3fb05cd71b21613ae"
COMMIT="93cd0d642cf1b58f9f4528275e2a2aa758e9feb3"
SHA2="b24ab6aacc2a40421ff1bbf4983121209d8079f1656a6f986e8f92d55e0dade1"
4 changes: 2 additions & 2 deletions tools/maghemite_mgd_checksums
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
CIDL_SHA256="7c10ac7d284ce78e70e652ad91bebf3fee7a2274ee403a09cc986c6ee73cf1eb"
MGD_LINUX_SHA256="be4c6f7375ff3e619102783513348e8769579bd011a85e33779b690759fd0868"
CIDL_SHA256="9db633384abe06f23c2b396c4beda3e34ec9bf74d538a914eb57198f6ba8992e"
MGD_LINUX_SHA256="bf83bf460c21a3734b3fdaf0820efa641bbbc93a66ec29caa681ee4e488390a3"
2 changes: 1 addition & 1 deletion tools/opte_version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.33.293
0.34.301
2 changes: 1 addition & 1 deletion tools/opte_version_override
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

# only set this if you want to override the version of opte/xde installed by the
# install_opte.sh script
OPTE_COMMIT="f3002b356da7d0e4ca15beb66a5566a92919baaa"
OPTE_COMMIT="98247c27846133a80fdb8f730f0c57e72d766561"

0 comments on commit e289427

Please sign in to comment.