From e57776527f9af95c426ebacc3be8915dc7705f57 Mon Sep 17 00:00:00 2001 From: Eliza Weisman Date: Thu, 17 Oct 2024 11:37:02 -0700 Subject: [PATCH 1/3] [test-util] Embiggen SP-sim discovery timeout (#6879) --- gateway-test-utils/src/setup.rs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gateway-test-utils/src/setup.rs b/gateway-test-utils/src/setup.rs index 056bb451f7..d8e5a89734 100644 --- a/gateway-test-utils/src/setup.rs +++ b/gateway-test-utils/src/setup.rs @@ -197,7 +197,11 @@ pub async fn test_setup_with_config( future::ready(result) }, &Duration::from_millis(100), - &Duration::from_secs(1), + // This seems like a pretty long time to wait for MGS to discover the + // simulated SPs, but we've seen tests fail due to timeouts here in the + // past, so we may as well be generous: + // https://github.com/oxidecomputer/omicron/issues/6877 + &Duration::from_secs(30), ) .await .unwrap(); From b21c9158617c36cd440d733988204cfcdd0622a5 Mon Sep 17 00:00:00 2001 From: "oxide-renovate[bot]" <146848827+oxide-renovate[bot]@users.noreply.github.com> Date: Thu, 17 Oct 2024 14:31:53 -0700 Subject: [PATCH 2/3] Update Rust crate uzers to 0.12 (#6860) --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9ed5eb5828..acb9e9d57f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -12240,9 +12240,9 @@ dependencies = [ [[package]] name = "uzers" -version = "0.11.3" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d283dc7e8c901e79e32d077866eaf599156cbf427fffa8289aecc52c5c3f63" +checksum = "4df81ff504e7d82ad53e95ed1ad5b72103c11253f39238bcc0235b90768a97dd" dependencies = [ "libc", "log", diff --git a/Cargo.toml b/Cargo.toml index 6168caee77..b585bc866b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -624,7 +624,7 @@ update-engine = { path = "update-engine" } url = "2.5.2" usdt = "0.5.0" uuid = { version = "1.10.0", features = ["serde", "v4"] } -uzers = "0.11" +uzers = "0.12" walkdir = "2.5" whoami = "1.5" wicket = { path = "wicket" } From 7b3dd553c58fc3c983d8dcb8bd0c62cf9499a83e Mon Sep 17 00:00:00 2001 From: "oxide-renovate[bot]" <146848827+oxide-renovate[bot]@users.noreply.github.com> Date: Fri, 18 Oct 2024 04:40:05 +0000 Subject: [PATCH 3/3] Update taiki-e/install-action digest to 3e1dd22 (#6897) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [taiki-e/install-action](https://redirect.github.com/taiki-e/install-action) | action | digest | [`42f4ec8` -> `3e1dd22`](https://redirect.github.com/taiki-e/install-action/compare/42f4ec8...3e1dd22) | --- ### Configuration 📅 **Schedule**: Branch creation - "after 8pm,before 6am" in timezone America/Los_Angeles, Automerge - "after 8pm,before 6am" in timezone America/Los_Angeles. 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://redirect.github.com/renovatebot/renovate). Co-authored-by: oxide-renovate[bot] <146848827+oxide-renovate[bot]@users.noreply.github.com> --- .github/workflows/hakari.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/hakari.yml b/.github/workflows/hakari.yml index 25975873f3..3379ae9e51 100644 --- a/.github/workflows/hakari.yml +++ b/.github/workflows/hakari.yml @@ -23,7 +23,7 @@ jobs: with: toolchain: stable - name: Install cargo-hakari - uses: taiki-e/install-action@42f4ec8e42bf7fe4dadd39bfc534566095a8edff # v2 + uses: taiki-e/install-action@3e1dd227d968fb9fa43ff604bd9b0ccd1b714919 # v2 with: tool: cargo-hakari - name: Check workspace-hack Cargo.toml is up-to-date