[pull] main from bootc-dev:main

Justfile

@@ -125,10 +125,6 @@ build-integration-test-image-from-package PATH: _pull-lbi-images
 
 # Build+test using the `composefs-sealeduki-sdboot` variant.
 test-composefs:
-    # These first two are currently a distinct test suite from tmt that directly
-    # runs an integration test binary in the base image via bcvk
-    cargo run --release -p tests-integration -- composefs-bcvk {{integration_img}}
-    # We're trying to move more testing to tmt
     just variant=composefs-sealeduki-sdboot test-tmt readonly local-upgrade-reboot
 
 # Only used by ci.yml right now

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

@@ -4,7 +4,6 @@ use camino::Utf8PathBuf;
 use cap_std_ext::cap_std::{self, fs::Dir};
 use clap::Parser;
 
-mod composefs_bcvk;
 mod container;
 mod hostpriv;
 mod install;
@@ -32,11 +31,6 @@ pub(crate) enum Opt {
         #[clap(flatten)]
         testargs: libtest_mimic::Arguments,
     },
-    ComposefsBcvk {
-        image: String,
-        #[clap(flatten)]
-        testargs: libtest_mimic::Arguments,
-    },
     /// Tests which should be executed inside an existing bootc container image.
     /// These should be nondestructive.
     Container {
@@ -61,7 +55,6 @@ fn main() {
         Opt::SystemReinstall { image, testargs } => system_reinstall::run(&image, testargs),
         Opt::InstallAlongside { image, testargs } => install::run_alongside(&image, testargs),
         Opt::HostPrivileged { image, testargs } => hostpriv::run_hostpriv(&image, testargs),
-        Opt::ComposefsBcvk { image, testargs } => composefs_bcvk::run(&image, testargs),
         Opt::Container { testargs } => container::run(testargs),
         Opt::RunVM(opts) => runvm::run(opts),
         Opt::VerifySELinux { rootfs, warn } => {