From 3b68e41746a4593df5b62bc7278b2aff06b68497 Mon Sep 17 00:00:00 2001 From: Xiaofeng Wang Date: Mon, 24 Jun 2024 21:32:11 +0800 Subject: [PATCH 1/2] tmt: rename tmt test log folder name to test-tmt-log run-001 does not make any sense, change to test-tmt-log add comments for tmt test log move Signed-off-by: Xiaofeng Wang --- plans/build.fmf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/plans/build.fmf b/plans/build.fmf index 91a140dec..d274d353b 100644 --- a/plans/build.fmf +++ b/plans/build.fmf @@ -22,4 +22,6 @@ discover: 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 From a5630ca79daf496accb95838fa4d27a89d63ca6c Mon Sep 17 00:00:00 2001 From: Xiaofeng Wang Date: Mon, 24 Jun 2024 22:33:11 +0800 Subject: [PATCH 2/2] tmt: rename plan files: build.fmf to integration-build.fmf, integration.fmf to integration-run.fmf And rename tmt test from build-tmt.fmf to build-image.fmf Signed-off-by: Xiaofeng Wang --- .packit.yaml | 4 ++-- plans/{build.fmf => integration-build.fmf} | 2 +- plans/{integration.fmf => integration-run.fmf} | 0 tests-integration/build-image.fmf | 3 +++ tests-integration/build-tmt.fmf | 4 ---- xtask/src/xtask.rs | 2 +- 6 files changed, 7 insertions(+), 8 deletions(-) rename plans/{build.fmf => integration-build.fmf} (94%) rename plans/{integration.fmf => integration-run.fmf} (100%) create mode 100644 tests-integration/build-image.fmf delete mode 100644 tests-integration/build-tmt.fmf 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 94% rename from plans/build.fmf rename to plans/integration-build.fmf index d274d353b..975bb4cbc 100644 --- a/plans/build.fmf +++ b/plans/integration-build.fmf @@ -18,7 +18,7 @@ execute: discover: how: fmf test: - - /build-tmt/build-image + - /build-image finish: how: shell script: 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(()) }