From d328404e2686ba3904daa909a918da2d2e39be0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Zaoral?= Date: Tue, 8 Jul 2025 09:50:26 +0200 Subject: [PATCH 1/2] tests: migrate from STI to TMT Related: https://fedoraproject.org/wiki/Changes/DisableSTI --- .fmf/version | 1 + plans/ci.fmf | 5 +++++ tests/smoke-functionality/Makefile | 2 +- tests/smoke-functionality/main.fmf | 14 ++++++++++++++ tests/smoke-functionality/runtest.sh | 1 - tests/tests.yml | 11 ----------- 6 files changed, 21 insertions(+), 13 deletions(-) create mode 100644 .fmf/version create mode 100644 plans/ci.fmf create mode 100644 tests/smoke-functionality/main.fmf delete mode 100644 tests/tests.yml 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/plans/ci.fmf b/plans/ci.fmf new file mode 100644 index 0000000..c1627f9 --- /dev/null +++ b/plans/ci.fmf @@ -0,0 +1,5 @@ +summary: Basic smoke test +discover: + how: fmf +execute: + how: tmt diff --git a/tests/smoke-functionality/Makefile b/tests/smoke-functionality/Makefile index 5670168..9b27478 100644 --- a/tests/smoke-functionality/Makefile +++ b/tests/smoke-functionality/Makefile @@ -56,7 +56,7 @@ $(METADATA): Makefile @echo "Type: Sanity" >> $(METADATA) @echo "TestTime: 5m" >> $(METADATA) @echo "RunFor: teckit" >> $(METADATA) - @echo "Requires: teckit" >> $(METADATA) + @echo "Requires: teckit bash coreutils man-db" >> $(METADATA) @echo "Priority: Normal" >> $(METADATA) @echo "License: LGPLv2+ or CPL" >> $(METADATA) @echo "Confidential: no" >> $(METADATA) diff --git a/tests/smoke-functionality/main.fmf b/tests/smoke-functionality/main.fmf new file mode 100644 index 0000000..9514e77 --- /dev/null +++ b/tests/smoke-functionality/main.fmf @@ -0,0 +1,14 @@ +summary: tests basic functionality +contact: Than Ngo +component: + - teckit +test: ./runtest.sh +framework: beakerlib +require: + - bash + - coreutils + - man-db + - teckit +duration: 5m +extra-summary: /CoreOS/teckit/smoke-functionality +extra-task: /CoreOS/teckit/smoke-functionality diff --git a/tests/smoke-functionality/runtest.sh b/tests/smoke-functionality/runtest.sh index 804e753..8a61228 100755 --- a/tests/smoke-functionality/runtest.sh +++ b/tests/smoke-functionality/runtest.sh @@ -27,7 +27,6 @@ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # Include Beaker environment -. /usr/bin/rhts-environment.sh || exit 1 . /usr/share/beakerlib/beakerlib.sh || exit 1 PACKAGE="teckit" diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index c01163c..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -# Run tests in all contexts -- hosts: localhost - tags: - - classic - roles: - - role: standard-test-beakerlib - tests: - - smoke-functionality - required_packages: - - teckit From b3f169c3508824afab8134398bc96ea05ba828a7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 19:10:16 +0000 Subject: [PATCH 2/2] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- teckit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/teckit.spec b/teckit.spec index 7f1039b..d67dc82 100644 --- a/teckit.spec +++ b/teckit.spec @@ -1,6 +1,6 @@ Name: teckit Version: 2.5.12 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Encoding conversion library and mapping compiler # COPYING: links to license/LICENSING.txt # license/License_CPLv05.txt: CPL-1.0 text, "0.5" version in the license @@ -134,6 +134,9 @@ rm -f %{buildroot}%{_libdir}/*.la %{_libdir}/pkgconfig/teckit.pc %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 2.5.12-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sun Jan 19 2025 Fedora Release Engineering - 2.5.12-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild