From 6f0440768f2de2ffb4190db043fa9074accaa58c Mon Sep 17 00:00:00 2001 From: Kyle Simpson Date: Wed, 20 Nov 2024 23:12:33 +0000 Subject: [PATCH] Bump to maghmeite/main, new lab image. --- .github/buildomat/jobs/deploy.sh | 4 ++-- Cargo.lock | 4 ++-- Cargo.toml | 4 ++-- package-manifest.toml | 10 +++++----- tools/maghemite_ddm_openapi_version | 2 +- tools/maghemite_mg_openapi_version | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/buildomat/jobs/deploy.sh b/.github/buildomat/jobs/deploy.sh index 0f2879d3b4..6118c4712c 100755 --- a/.github/buildomat/jobs/deploy.sh +++ b/.github/buildomat/jobs/deploy.sh @@ -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*", @@ -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="98247c27846133a80fdb8f730f0c57e72d766561" +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 diff --git a/Cargo.lock b/Cargo.lock index f0453df263..b7ee0d03b8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2103,7 +2103,7 @@ dependencies = [ [[package]] name = "ddm-admin-client" version = "0.1.0" -source = "git+https://github.com/oxidecomputer/maghemite?rev=056283eb02b6887fbf27f66a215662520f7c159c#056283eb02b6887fbf27f66a215662520f7c159c" +source = "git+https://github.com/oxidecomputer/maghemite?rev=93cd0d642cf1b58f9f4528275e2a2aa758e9feb3#93cd0d642cf1b58f9f4528275e2a2aa758e9feb3" dependencies = [ "oxnet", "percent-encoding", @@ -5454,7 +5454,7 @@ dependencies = [ [[package]] name = "mg-admin-client" version = "0.1.0" -source = "git+https://github.com/oxidecomputer/maghemite?rev=056283eb02b6887fbf27f66a215662520f7c159c#056283eb02b6887fbf27f66a215662520f7c159c" +source = "git+https://github.com/oxidecomputer/maghemite?rev=93cd0d642cf1b58f9f4528275e2a2aa758e9feb3#93cd0d642cf1b58f9f4528275e2a2aa758e9feb3" dependencies = [ "anyhow", "chrono", diff --git a/Cargo.toml b/Cargo.toml index 4aae626a90..46e5efcfb9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -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" } diff --git a/package-manifest.toml b/package-manifest.toml index 4dc4466d10..678482ceff 100644 --- a/package-manifest.toml +++ b/package-manifest.toml @@ -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 = "21eb5a52ec2711b2c365aa6efd9130ce208364a4" +source.commit = "93cd0d642cf1b58f9f4528275e2a2aa758e9feb3" # The SHA256 digest is automatically posted to: # https://buildomat.eng.oxide.computer/public/file/oxidecomputer/maghemite/image//mg-ddm-gz.sha256.txt -source.sha256 = "e533b5bb9525298737818ed9518459262ac34ba4239d1ff8fbcc27606745a092" +source.sha256 = "5265f638b0ad4bd640113d4c8a30215388c695e7084db9c6cc113f5e350086fb" output.type = "tarball" [package.mg-ddm] @@ -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 = "21eb5a52ec2711b2c365aa6efd9130ce208364a4" +source.commit = "93cd0d642cf1b58f9f4528275e2a2aa758e9feb3" # The SHA256 digest is automatically posted to: # https://buildomat.eng.oxide.computer/public/file/oxidecomputer/maghemite/image//mg-ddm.sha256.txt -source.sha256 = "1cd1020dea664f6e238bc605ec0256b4932450c307737553dd72f2a0f56964fa" +source.sha256 = "b0b1b96d76cf179313305aa85857e469dd76d90e1c075305b72bd3675ef9538e" output.type = "zone" output.intermediate_only = true @@ -668,7 +668,7 @@ 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 = "21eb5a52ec2711b2c365aa6efd9130ce208364a4" +source.commit = "93cd0d642cf1b58f9f4528275e2a2aa758e9feb3" # The SHA256 digest is automatically posted to: # https://buildomat.eng.oxide.computer/public/file/oxidecomputer/maghemite/image//mgd.sha256.txt source.sha256 = "9db633384abe06f23c2b396c4beda3e34ec9bf74d538a914eb57198f6ba8992e" diff --git a/tools/maghemite_ddm_openapi_version b/tools/maghemite_ddm_openapi_version index dee7821e0a..c27cad916d 100644 --- a/tools/maghemite_ddm_openapi_version +++ b/tools/maghemite_ddm_openapi_version @@ -1,2 +1,2 @@ -COMMIT="21eb5a52ec2711b2c365aa6efd9130ce208364a4" +COMMIT="93cd0d642cf1b58f9f4528275e2a2aa758e9feb3" SHA2="007bfb717ccbc077c0250dee3121aeb0c5bb0d1c16795429a514fa4f8635a5ef" diff --git a/tools/maghemite_mg_openapi_version b/tools/maghemite_mg_openapi_version index f3e4e9c97e..6d0710f45a 100644 --- a/tools/maghemite_mg_openapi_version +++ b/tools/maghemite_mg_openapi_version @@ -1,2 +1,2 @@ -COMMIT="21eb5a52ec2711b2c365aa6efd9130ce208364a4" +COMMIT="93cd0d642cf1b58f9f4528275e2a2aa758e9feb3" SHA2="b24ab6aacc2a40421ff1bbf4983121209d8079f1656a6f986e8f92d55e0dade1"