Skip to content

Commit bf08c17

Browse files
authored
tests: Remove composefs-bcvk test infrastructure (#1848)
The composefs-bcvk tests were a separate test path that ran integration tests directly via bcvk. This functionality is now covered by the tmt-based testing framework, so remove the redundant infrastructure. Signed-off-by: Colin Walters <walters@verbum.org>
1 parent 6f69534 commit bf08c17

File tree

3 files changed

+0
-120
lines changed

3 files changed

+0
-120
lines changed

Justfile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -125,10 +125,6 @@ build-integration-test-image-from-package PATH: _pull-lbi-images
125125

126126
# Build+test using the `composefs-sealeduki-sdboot` variant.
127127
test-composefs:
128-
# These first two are currently a distinct test suite from tmt that directly
129-
# runs an integration test binary in the base image via bcvk
130-
cargo run --release -p tests-integration -- composefs-bcvk {{integration_img}}
131-
# We're trying to move more testing to tmt
132128
just variant=composefs-sealeduki-sdboot test-tmt readonly local-upgrade-reboot
133129

134130
# Only used by ci.yml right now

crates/tests-integration/src/composefs_bcvk.rs

Lines changed: 0 additions & 109 deletions
This file was deleted.

crates/tests-integration/src/tests-integration.rs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ use camino::Utf8PathBuf;
44
use cap_std_ext::cap_std::{self, fs::Dir};
55
use clap::Parser;
66

7-
mod composefs_bcvk;
87
mod container;
98
mod hostpriv;
109
mod install;
@@ -32,11 +31,6 @@ pub(crate) enum Opt {
3231
#[clap(flatten)]
3332
testargs: libtest_mimic::Arguments,
3433
},
35-
ComposefsBcvk {
36-
image: String,
37-
#[clap(flatten)]
38-
testargs: libtest_mimic::Arguments,
39-
},
4034
/// Tests which should be executed inside an existing bootc container image.
4135
/// These should be nondestructive.
4236
Container {
@@ -61,7 +55,6 @@ fn main() {
6155
Opt::SystemReinstall { image, testargs } => system_reinstall::run(&image, testargs),
6256
Opt::InstallAlongside { image, testargs } => install::run_alongside(&image, testargs),
6357
Opt::HostPrivileged { image, testargs } => hostpriv::run_hostpriv(&image, testargs),
64-
Opt::ComposefsBcvk { image, testargs } => composefs_bcvk::run(&image, testargs),
6558
Opt::Container { testargs } => container::run(testargs),
6659
Opt::RunVM(opts) => runvm::run(opts),
6760
Opt::VerifySELinux { rootfs, warn } => {

0 commit comments

Comments
 (0)