From ee7a565f10c83da62fdda8c5eb2e3d43b0ecca9f Mon Sep 17 00:00:00 2001 From: Pragyan Poudyal Date: Wed, 11 Feb 2026 20:27:38 +0530 Subject: [PATCH] tmt: Change var name to be less confusing We had `works_for_composefs` as a field of the struct to signify whether a test works for composefs or not. We then changed the actual yaml counterpart to be `fixme_skip_if_composefs` but the var name remained as is which is a bit confusing. Also, remove some debug code in tests Signed-off-by: Pragyan Poudyal --- crates/xtask/src/tmt.rs | 10 +++++----- .../booted/test-install-to-filesystem-var-mount.sh | 2 -- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/crates/xtask/src/tmt.rs b/crates/xtask/src/tmt.rs index e244229c1..5ef546321 100644 --- a/crates/xtask/src/tmt.rs +++ b/crates/xtask/src/tmt.rs @@ -908,8 +908,8 @@ struct TestDef { test_command: String, /// Whether this test wants to try bind storage (if distro supports it) try_bind_storage: bool, - /// Whether this test will work for composefs backend - works_for_composefs: bool, + /// Whether to skip this test for composefs backend + skip_if_composefs: bool, /// TMT fmf attributes to pass through (summary, duration, adjust, etc.) tmt: serde_yaml::Value, } @@ -1000,7 +1000,7 @@ pub(crate) fn update_integration() -> Result<()> { .and_then(|v| v.as_bool()) .unwrap_or(false); - let works_for_composefs = metadata + let skip_if_composefs = metadata .extra .as_mapping() .and_then(|m| { @@ -1016,7 +1016,7 @@ pub(crate) fn update_integration() -> Result<()> { name: display_name, test_command, try_bind_storage, - works_for_composefs, + skip_if_composefs, tmt: metadata.tmt, }); } @@ -1135,7 +1135,7 @@ pub(crate) fn update_integration() -> Result<()> { ); } - if test.works_for_composefs { + if test.skip_if_composefs { plan_value.insert( serde_yaml::Value::String(format!("extra-{}", FIELD_FIXME_SKIP_IF_COMPOSEFS)), serde_yaml::Value::Bool(true), diff --git a/tmt/tests/booted/test-install-to-filesystem-var-mount.sh b/tmt/tests/booted/test-install-to-filesystem-var-mount.sh index e1dd4cf1f..4499b5be5 100644 --- a/tmt/tests/booted/test-install-to-filesystem-var-mount.sh +++ b/tmt/tests/booted/test-install-to-filesystem-var-mount.sh @@ -125,8 +125,6 @@ if [[ $is_composefs != "null" ]]; then tune2fs -O verity /dev/BL/root02 fi -echo "${COMPOSEFS_BACKEND[@]}" - # Run bootc install to-filesystem from within the container image under test podman run \ --rm --privileged \