From 07927c9639aa73377c6b451aaede56d2bc0e77d0 Mon Sep 17 00:00:00 2001
From: Chloe Kaubisch <chloe.kaubisch@gmail.com>
Date: Wed, 16 Feb 2022 14:30:34 +0000
Subject: [PATCH] Update to 48

Use tmt based tests instead of STI

Resolves: rhbz#2011777
---
 .fmf/version    |  1 +
 .gitignore      |  1 +
 osbuild.spec    |  5 ++++-
 plans/tests.fmf | 17 +++++++++++++++++
 sources         |  2 +-
 tests/image.fmf |  2 ++
 tests/tests.yml | 20 --------------------
 tests/unit.fmf  |  2 ++
 8 files changed, 28 insertions(+), 22 deletions(-)
 create mode 100644 .fmf/version
 create mode 100644 plans/tests.fmf
 create mode 100644 tests/image.fmf
 delete mode 100644 tests/tests.yml
 create mode 100644 tests/unit.fmf

diff --git a/.fmf/version b/.fmf/version
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/.fmf/version
@@ -0,0 +1 @@
+1
diff --git a/.gitignore b/.gitignore
index d2b6956..bf9653d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,3 +39,4 @@
 /osbuild-45.tar.gz
 /osbuild-46.tar.gz
 /osbuild-47.tar.gz
+/osbuild-48.tar.gz
diff --git a/osbuild.spec b/osbuild.spec
index 994f6d9..7bf00d1 100644
--- a/osbuild.spec
+++ b/osbuild.spec
@@ -1,7 +1,7 @@
 %global         forgeurl https://github.com/osbuild/osbuild
 %global         selinuxtype targeted
 
-Version:        47
+Version:        48
 
 %forgemeta
 
@@ -248,6 +248,9 @@ fi
 
 
 %changelog
+* Wed Feb 16 2022 Chloe Kaubisch <chloe.kaubisch@gmail.com> - 48-1
+- New upstream release
+
 * Wed Feb 02 2022 Jacob Kozol <jacobdkozol@gmail.com> - 47-1
 - New upstream release
 
diff --git a/plans/tests.fmf b/plans/tests.fmf
new file mode 100644
index 0000000..2a9028c
--- /dev/null
+++ b/plans/tests.fmf
@@ -0,0 +1,17 @@
+summary: Run osbuild tests
+prepare:
+    how: install
+    package:
+    - git
+    - make
+    - python3-mako
+    - python3-pytest
+    - osbuild
+discover:
+    how: fmf
+    dist-git-source: true
+execute:
+    how: tmt
+adjust:
+    enabled: false
+    when: distro == centos-stream-9
diff --git a/sources b/sources
index 8c0fb39..6816b9f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (osbuild-47.tar.gz) = 3767661bfeae60d53c895c276cb111f3b1b5fe422200c817b9828fa0526ac9257e08741ffce50522e503cb004ebd8b1bf5260f8014ee3e722087df70b738aec3
+SHA512 (osbuild-48.tar.gz) = 009f6afe3aa8664ca030eaefcfcb4657470a5f0879d81b35dcf38b5516549fab6f0337bdc3544c6031684d76c0e71e4a131c06b915840c7f8813fcaee52ccdf5
diff --git a/tests/image.fmf b/tests/image.fmf
new file mode 100644
index 0000000..4802ff4
--- /dev/null
+++ b/tests/image.fmf
@@ -0,0 +1,2 @@
+summary: Run image test
+test: osbuild test-image.json --output-directory=/var/tmp/osbuild
diff --git a/tests/tests.yml b/tests/tests.yml
deleted file mode 100644
index 00421ae..0000000
--- a/tests/tests.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-- hosts: localhost
-  roles:
-  - role: standard-test-source
-    tags:
-    - always
-  - role: standard-test-basic
-    tags:
-    - classic
-    required_packages:
-    - git
-    - make
-    - python3-mako
-    - python3-pytest
-    tests:
-    - unit:
-        dir: source
-        run: python3 -m pytest test/mod
-    - image:
-        dir: tests
-        run: osbuild test-image.json --output-directory=/var/tmp/osbuild
diff --git a/tests/unit.fmf b/tests/unit.fmf
new file mode 100644
index 0000000..28a6b69
--- /dev/null
+++ b/tests/unit.fmf
@@ -0,0 +1,2 @@
+summary: Run unit tests using upstream source
+test: cd ../osbuild-*/ && python3 -m pytest test/mod