From b94a349f1b499bf572a7ecb9f4dd0a93481d51df Mon Sep 17 00:00:00 2001 From: Patrick Roy Date: Tue, 8 Oct 2024 14:52:46 +0100 Subject: [PATCH] Enable running kani on ARM Kani supports verification on ARM since version 0.37.0 [1], so enable it in our CI. [1]: https://github.com/model-checking/kani/blob/main/CHANGELOG.md#0370 Signed-off-by: Patrick Roy --- .buildkite/pipeline_pr.py | 2 +- tools/devctr/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.buildkite/pipeline_pr.py b/.buildkite/pipeline_pr.py index 3a56e348b60..618aa17860b 100755 --- a/.buildkite/pipeline_pr.py +++ b/.buildkite/pipeline_pr.py @@ -56,7 +56,7 @@ "./tools/devtool -y test --no-build -- ../tests/integration_tests/test_kani.py -n auto", # Kani step default # Kani runs fastest on m6a.metal - instances=["m6a.metal"], + instances=["m6a.metal", "m7g.metal"], platforms=[("al2", "linux_5.10")], timeout_in_minutes=300, **DEFAULTS_PERF, diff --git a/tools/devctr/Dockerfile b/tools/devctr/Dockerfile index 1570c24f312..21304d3e317 100644 --- a/tools/devctr/Dockerfile +++ b/tools/devctr/Dockerfile @@ -107,7 +107,7 @@ RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain "$RUST_TOOL && rustup target add aarch64-unknown-linux-musl \ && rustup component add llvm-tools-preview \ && cargo install --locked cargo-audit cargo-deny grcov cargo-sort cargo-afl \ - && (if [ "$ARCH" = "x86_64" ]; then cargo install --locked kani-verifier && cargo kani setup; else true; fi) \ + && cargo install --locked kani-verifier && cargo kani setup \ \ && apt-get update \ && apt-get -y install --no-install-recommends \