From b222aac3b9386293aa9f0cdd587b2de0abef0f95 Mon Sep 17 00:00:00 2001 From: Patrick Roy Date: Wed, 1 Oct 2025 12:18:18 +0100 Subject: [PATCH] revert to using normal rust-vmm-ci tests Now that rust-vmm-ci uses cargo-all-features, we can deal with the incompatiblity of the xen and postcopy features by simply marking them as incompatible in Cargo.toml, instead of needing to define separate CI steps. note: this commit currently symlinks rust-vmm-ci-tests.json to rust-vmm-ci/.buildkite/test_descriptions.json, and removes all tests from custom-tests.json. This is to illustrate that the new setup works without changes to the buildkite pipeline. Once that is confirmed, the pipeline should be updated to just use the rust-vmm-ci test generaiton routine, and the entire .buildkite directory can be removed. Signed-off-by: Patrick Roy --- .buildkite/README.md | 18 ----- .buildkite/custom-tests.json | 21 ------ .buildkite/rust-vmm-ci-tests.json | 113 +----------------------------- 3 files changed, 1 insertion(+), 151 deletions(-) delete mode 100644 .buildkite/README.md mode change 100644 => 120000 .buildkite/rust-vmm-ci-tests.json diff --git a/.buildkite/README.md b/.buildkite/README.md deleted file mode 100644 index 2fba68d..0000000 --- a/.buildkite/README.md +++ /dev/null @@ -1,18 +0,0 @@ -# buildkite custom pipelines - -This folder contains the custom pipelines for this repository. - -If we add a new pipeline we need to enable it in -https://buildkite.com/rust-vmm/vhost-ci/steps - -Custom pipelines currently defined are: -- `custom-tests.json` - Custom tests to enable only certain features. - -- `rust-vmm-ci-tests.json` - This is based on `rust-vmm-ci/.buildkite/test_description.json`. - We can't run rust-vmm-ci tests because they enable all the features with - `--all-features` and our crates have features that may not be compatible with - others (e.g. `xen`). Waiting to solve this problem in rust-vmm-ci (see - https://github.com/rust-vmm/rust-vmm-ci/issues/152), we use a custom - pipeline based on that but that does not use `--all-features`. diff --git a/.buildkite/custom-tests.json b/.buildkite/custom-tests.json index 892cbb5..573f53e 100644 --- a/.buildkite/custom-tests.json +++ b/.buildkite/custom-tests.json @@ -1,25 +1,4 @@ { "tests": [ - { - "test_name": "build-vhost-kern", - "command": "cargo build --features=vhost-kern", - "platform": [ - "x86_64" - ] - }, - { - "test_name": "build-vhost-user-frontend", - "command": "cargo build --features=vhost-user-frontend", - "platform": [ - "x86_64" - ] - }, - { - "test_name": "build-vhost-user-backend", - "command": "cargo build --features=vhost-user-backend", - "platform": [ - "x86_64" - ] - } ] } diff --git a/.buildkite/rust-vmm-ci-tests.json b/.buildkite/rust-vmm-ci-tests.json deleted file mode 100644 index 630fc61..0000000 --- a/.buildkite/rust-vmm-ci-tests.json +++ /dev/null @@ -1,112 +0,0 @@ -{ - "tests": [ - { - "test_name": "build-gnu", - "command": "RUSTFLAGS=\"-D warnings\" cargo build --release", - "platform": [ - "x86_64", - "aarch64" - ] - }, - { - "test_name": "build-musl", - "command": "RUSTFLAGS=\"-D warnings\" cargo build --release --target {target_platform}-unknown-linux-musl", - "platform": [ - "x86_64", - "aarch64" - ] - }, - { - "test_name": "style", - "command": "cargo fmt --all -- --check --config format_code_in_doc_comments=true" - }, - { - "test_name": "unittests-gnu-all-with-xen", - "command": "cargo test --workspace --no-default-features --features test-utils,vhost-vsock,vhost-kern,vhost-vdpa,vhost-net,vhost-user,vhost-user-frontend,vhost-user-backend,xen", - "platform": [ - "x86_64", - "aarch64" - ] - }, - { - "test_name": "unittests-gnu-all-without-xen", - "command": "cargo test --workspace --no-default-features --features test-utils,vhost-vsock,vhost-kern,vhost-vdpa,vhost-net,vhost-user,vhost-user-frontend,vhost-user-backend,postcopy", - "platform": [ - "x86_64", - "aarch64" - ] - }, - { - "test_name": "unittests-musl-all-with-xen", - "command": "cargo test --workspace --target {target_platform}-unknown-linux-musl --no-default-features --features test-utils,vhost-vsock,vhost-kern,vhost-vdpa,vhost-net,vhost-user,vhost-user-frontend,vhost-user-backend,xen", - "platform": [ - "x86_64", - "aarch64" - ] - }, - { - "test_name": "unittests-musl-all-without-xen", - "command": "cargo test --workspace --target {target_platform}-unknown-linux-musl --no-default-features --features test-utils,vhost-vsock,vhost-kern,vhost-vdpa,vhost-net,vhost-user,vhost-user-frontend,vhost-user-backend,postcopy", - "platform": [ - "x86_64", - "aarch64" - ] - }, - { - "test_name": "clippy-all-with-xen", - "command": "cargo clippy --workspace --bins --examples --benches --all-targets --no-default-features --features test-utils,vhost-vsock,vhost-kern,vhost-vdpa,vhost-net,vhost-user,vhost-user-frontend,vhost-user-backend,xen -- -D warnings -D clippy::undocumented_unsafe_blocks", - "platform": [ - "x86_64", - "aarch64" - ] - }, - { - "test_name": "clippy-all-without-xen", - "command": "cargo clippy --workspace --bins --examples --benches --all-targets --no-default-features --features test-utils,vhost-vsock,vhost-kern,vhost-vdpa,vhost-net,vhost-user,vhost-user-frontend,vhost-user-backend,postcopy -- -D warnings -D clippy::undocumented_unsafe_blocks", - "platform": [ - "x86_64", - "aarch64" - ] - }, - { - "test_name": "check-warnings-all-with-xen", - "command": "RUSTFLAGS=\"-D warnings\" cargo check --all-targets --workspace --no-default-features --features test-utils,vhost-vsock,vhost-kern,vhost-vdpa,vhost-net,vhost-user,vhost-user-frontend,vhost-user-backend,xen", - "platform": [ - "x86_64", - "aarch64" - ] - }, - { - "test_name": "check-warnings-all-without-xen", - "command": "RUSTFLAGS=\"-D warnings\" cargo check --all-targets --workspace --no-default-features --features test-utils,vhost-vsock,vhost-kern,vhost-vdpa,vhost-net,vhost-user,vhost-user-frontend,vhost-user-backend,postcopy", - "platform": [ - "x86_64", - "aarch64" - ] - }, - { - "test_name": "coverage", - "command": "pytest $(find . -type f -name \"test_coverage.py\")", - "docker_plugin": { - "privileged": true - }, - "platform": [ - "x86_64" - ] - }, - { - "test_name": "commit-format", - "command": "pytest $(find . -type f -name \"test_commit_format.py\")", - "docker_plugin": { - "propagate-environment": true - } - }, - { - "test_name": "cargo-audit", - "command": "[ -e Cargo.lock ] || cargo generate-lockfile; cargo audit -q --deny warnings", - "platform": [ - "x86_64" - ] - } - ] -} diff --git a/.buildkite/rust-vmm-ci-tests.json b/.buildkite/rust-vmm-ci-tests.json new file mode 120000 index 0000000..586acc3 --- /dev/null +++ b/.buildkite/rust-vmm-ci-tests.json @@ -0,0 +1 @@ +../rust-vmm-ci/.buildkite/test_description.json \ No newline at end of file