Merge pull request #633 from henrywang/e2e_packit

test: rename tmt test log folder and rename tmt plan name
containers · Jun 24, 2024 · b73b5f7 · b73b5f7
2 parents f15f650 + a5630ca
commit b73b5f7
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 9 deletions.
diff --git 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 → plans/integration-build.fmf b/plans/build.fmf → 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 → plans/integration-run.fmf b/plans/integration.fmf → plans/integration-run.fmf
diff --git a/tests-integration/build-image.fmf 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
diff --git 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(())
 }