wip test

crates/xtask/src/tmt.rs

@@ -827,6 +827,11 @@ pub(crate) fn update_integration() -> Result<()> {
             continue;
         };
 
+        if stem != "testing-ex" {
+            println!("SKIPPING: {stem}");
+            continue
+        }
+
         let content =
             std::fs::read_to_string(&path).with_context(|| format!("Reading {}", filename))?;
 
@@ -862,6 +867,8 @@ pub(crate) fn update_integration() -> Result<()> {
 
         let test_command = format!("{} {}", extension, relative_path.display());
 
+        println!("test_command: {test_command}");
+
         // Check if test wants bind storage
         let try_bind_storage = metadata
             .extra

crates/xtask/src/xtask.rs

@@ -4,6 +4,8 @@
 //! by the user - add commands here which otherwise might
 //! end up as a lot of nontrivial bash code.
 
+#![allow(dead_code)]
+
 use std::fs::File;
 use std::io::{BufRead, BufReader, BufWriter, Write};
 use std::process::Command;
@@ -392,10 +394,10 @@ fn update_json_schemas(sh: &Shell) -> Result<()> {
 #[context("Updating generated files")]
 fn update_generated(sh: &Shell) -> Result<()> {
     // Update man pages (create new templates + sync options)
-    man::update_manpages(sh)?;
+    // man::update_manpages(sh)?;
 
     // Update JSON schemas
-    update_json_schemas(sh)?;
+    // update_json_schemas(sh)?;
 
     // Update TMT integration.fmf
     tmt::update_integration()?;

hack/system-reinstall-bootc.exp

@@ -3,7 +3,7 @@
 # Set a timeout
 set timeout 600
 
-spawn system-reinstall-bootc localhost/bootc-integration
+spawn system-reinstall-bootc --composefs-backend localhost/bootc-integration
 
 expect {
     "Then you can login as * using those keys. \\\[Y/n\\\]" {

tmt/plans/integration.fmf

@@ -37,107 +37,10 @@ execute:
   how: tmt
 
 # BEGIN GENERATED PLANS
-/plan-01-readonly:
-  summary: Execute booted readonly/nondestructive tests
+/plan-450-testing-ex:
+  summary: Some random test
   discover:
     how: fmf
     test:
-      - /tmt/tests/tests/test-01-readonly
-  extra-try_bind_storage: true
-
-/plan-20-image-pushpull-upgrade:
-  summary: Execute local upgrade tests
-  discover:
-    how: fmf
-    test:
-      - /tmt/tests/tests/test-20-image-pushpull-upgrade
-
-/plan-21-logically-bound-switch:
-  summary: Execute logically bound images tests for switching images
-  discover:
-    how: fmf
-    test:
-      - /tmt/tests/tests/test-21-logically-bound-switch
-
-/plan-22-logically-bound-install:
-  summary: Execute logically bound images tests for installing image
-  discover:
-    how: fmf
-    test:
-      - /tmt/tests/tests/test-22-logically-bound-install
-
-/plan-23-install-outside-container:
-  summary: Execute tests for installing outside of a container
-  discover:
-    how: fmf
-    test:
-      - /tmt/tests/tests/test-23-install-outside-container
-
-/plan-23-usroverlay:
-  summary: Execute tests for bootc usrover
-  discover:
-    how: fmf
-    test:
-      - /tmt/tests/tests/test-23-usroverlay
-
-/plan-24-image-upgrade-reboot:
-  summary: Execute local upgrade tests
-  discover:
-    how: fmf
-    test:
-      - /tmt/tests/tests/test-24-image-upgrade-reboot
-  extra-try_bind_storage: true
-
-/plan-25-soft-reboot:
-  summary: Execute soft reboot test
-  discover:
-    how: fmf
-    test:
-      - /tmt/tests/tests/test-25-soft-reboot
-
-/plan-26-download-only-upgrade:
-  summary: Execute download-only upgrade tests
-  discover:
-    how: fmf
-    test:
-      - /tmt/tests/tests/test-26-download-only-upgrade
-
-/plan-27-custom-selinux-policy:
-  summary: Execute custom selinux policy test
-  discover:
-    how: fmf
-    test:
-      - /tmt/tests/tests/test-27-custom-selinux-policy
-  adjust:
-  - when: running_env != image_mode
-    enabled: false
-    because: these tests require features only available in image mode
-
-/plan-28-factory-reset:
-  summary: Execute factory reset tests
-  discover:
-    how: fmf
-    test:
-      - /tmt/tests/tests/test-28-factory-reset
-
-/plan-29-soft-reboot-selinux-policy:
-  summary: Test soft reboot with SELinux policy changes
-  discover:
-    how: fmf
-    test:
-      - /tmt/tests/tests/test-29-soft-reboot-selinux-policy
-
-/plan-30-install-unified-flag:
-  summary: Test bootc install with experimental unified storage flag
-  discover:
-    how: fmf
-    test:
-      - /tmt/tests/tests/test-30-install-unified-flag
-
-/plan-31-switch-to-unified:
-  summary: Onboard to unified storage, build derived image, and switch to it
-  discover:
-    how: fmf
-    test:
-      - /tmt/tests/tests/test-31-switch-to-unified
+      - /tmt/tests/tests/test-450-testing-ex
 # END GENERATED PLANS

tmt/tests/booted/test-testing-ex.nu

@@ -0,0 +1,13 @@
+# number: 450
+# tmt:
+#   summary: Some random test
+#   duration: 5m
+#
+# Verify that something works
+
+bootc status -v
+bootc status --json
+
+def main[] {
+    echo "The test has passed"
+}

tmt/tests/tests.fmf

@@ -1,76 +1,7 @@
 # THIS IS GENERATED CODE - DO NOT EDIT
 # Generated by: cargo xtask tmt
 
-/test-01-readonly:
-  summary: Execute booted readonly/nondestructive tests
-  duration: 30m
-  test: nu booted/test-01-readonly.nu
-
-/test-20-image-pushpull-upgrade:
-  summary: Execute local upgrade tests
-  duration: 30m
-  test: nu booted/test-image-pushpull-upgrade.nu
-
-/test-21-logically-bound-switch:
-  summary: Execute logically bound images tests for switching images
-  duration: 30m
-  test: nu booted/test-logically-bound-switch.nu
-
-/test-22-logically-bound-install:
-  summary: Execute logically bound images tests for installing image
-  duration: 30m
-  test: nu booted/test-logically-bound-install.nu
-
-/test-23-install-outside-container:
-  summary: Execute tests for installing outside of a container
-  duration: 30m
-  test: nu booted/test-install-outside-container.nu
-
-/test-23-usroverlay:
-  summary: Execute tests for bootc usrover
-  duration: 30m
-  test: nu booted/test-usroverlay.nu
-
-/test-24-image-upgrade-reboot:
-  summary: Execute local upgrade tests
-  duration: 30m
-  test: nu booted/test-image-upgrade-reboot.nu
-
-/test-25-soft-reboot:
-  summary: Execute soft reboot test
-  duration: 30m
-  test: nu booted/test-soft-reboot.nu
-
-/test-26-download-only-upgrade:
-  summary: Execute download-only upgrade tests
-  duration: 40m
-  test: nu booted/test-download-only-upgrade.nu
-
-/test-27-custom-selinux-policy:
-  summary: Execute custom selinux policy test
-  duration: 30m
-  adjust:
-  - when: running_env != image_mode
-    enabled: false
-    because: these tests require features only available in image mode
-  test: nu booted/test-custom-selinux-policy.nu
-
-/test-28-factory-reset:
-  summary: Execute factory reset tests
-  duration: 30m
-  test: nu booted/test-factory-reset.nu
-
-/test-29-soft-reboot-selinux-policy:
-  summary: Test soft reboot with SELinux policy changes
-  duration: 30m
-  test: nu booted/test-soft-reboot-selinux-policy.nu
-
-/test-30-install-unified-flag:
-  summary: Test bootc install with experimental unified storage flag
-  duration: 30m
-  test: nu booted/test-install-unified-flag.nu
-
-/test-31-switch-to-unified:
-  summary: Onboard to unified storage, build derived image, and switch to it
-  duration: 30m
-  test: nu booted/test-switch-to-unified.nu
+/test-450-testing-ex:
+  summary: Some random test
+  duration: 5m
+  test: nu booted/test-testing-ex.nu