diff --git a/.packit.yaml b/.packit.yaml index 98bc5b7e7..29c9639f2 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -5,6 +5,6 @@ jobs: targets: - fedora-40-x86_64 - fedora-40-aarch64 - tmt_plan: /build + tmt_plan: /integration-build skip_build: true - identifier: tmt-integration-test + identifier: integration-test diff --git a/plans/build.fmf b/plans/integration-build.fmf similarity index 63% rename from plans/build.fmf rename to plans/integration-build.fmf index 91a140dec..975bb4cbc 100644 --- a/plans/build.fmf +++ b/plans/integration-build.fmf @@ -18,8 +18,10 @@ execute: discover: how: fmf test: - - /build-tmt/build-image + - /build-image finish: how: shell script: - - cp -r /var/tmp/tmt/run-001 $TMT_PLAN_DATA + # move tmt test log to tmt plan data folder + # the tmt integration test log can be archived in testing farm artifacts + - cp -r /var/tmp/tmt/run-001 $TMT_PLAN_DATA/test-tmt-log diff --git a/plans/integration.fmf b/plans/integration-run.fmf similarity index 100% rename from plans/integration.fmf rename to plans/integration-run.fmf diff --git a/tests-integration/build-image.fmf b/tests-integration/build-image.fmf new file mode 100644 index 000000000..075df589c --- /dev/null +++ b/tests-integration/build-image.fmf @@ -0,0 +1,3 @@ +summary: build bootc and build qcow2 image +test: cd .. && dnf -y builddep bootc && make test-tmt +duration: 30m diff --git a/tests-integration/build-tmt.fmf b/tests-integration/build-tmt.fmf deleted file mode 100644 index a56c4b340..000000000 --- a/tests-integration/build-tmt.fmf +++ /dev/null @@ -1,4 +0,0 @@ -/build-image: - summary: build bootc and build qcow2 image - test: cd .. && dnf -y builddep bootc && make test-tmt - duration: 30m diff --git a/xtask/src/xtask.rs b/xtask/src/xtask.rs index 79d1dcc43..ba28f376d 100644 --- a/xtask/src/xtask.rs +++ b/xtask/src/xtask.rs @@ -146,7 +146,7 @@ fn man2markdown(sh: &Shell) -> Result<()> { #[context("test-integration")] fn test_tmt(sh: &Shell) -> Result<()> { cmd!(sh, "cargo run -p tests-integration run-vm prepare-tmt").run()?; - cmd!(sh, "tmt run plans -n integration").run()?; + cmd!(sh, "tmt run plans -n integration-run").run()?; Ok(()) }