From 52debdb86dcc1814c094bed69afed240802817b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Fri, 13 Sep 2024 06:41:40 +0000 Subject: [PATCH 1/4] Correct SPDX license formula Previously, the script for automatic conversion made an incorrect change. Reverting back as CPL-1.0 is a valid license id. --- iprutils.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/iprutils.spec b/iprutils.spec index ae13436..d992cb6 100644 --- a/iprutils.spec +++ b/iprutils.spec @@ -4,8 +4,7 @@ Summary: Utilities for the IBM Power Linux RAID adapters Name: iprutils Version: 2.4.19 Release: 14%{?dist} -# Automatically converted from old format: CPL-1.0 - review is highly recommended. -License: Not a valid license string in legacy syntax. Pass '--verbose' to get full parser error. +License: CPL-1.0 URL: https://github.com/bjking1/iprutils Source0: https://github.com/bjking1/iprutils/archive/%{gitver}/%{name}-%{version}.tar.gz From c88aa208ebcf8a665a09fb9d6c413e939eede0e1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 07:21:31 +0000 Subject: [PATCH 2/4] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- iprutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/iprutils.spec b/iprutils.spec index d992cb6..95b3c8b 100644 --- a/iprutils.spec +++ b/iprutils.spec @@ -3,7 +3,7 @@ Summary: Utilities for the IBM Power Linux RAID adapters Name: iprutils Version: 2.4.19 -Release: 14%{?dist} +Release: 15%{?dist} License: CPL-1.0 URL: https://github.com/bjking1/iprutils Source0: https://github.com/bjking1/iprutils/archive/%{gitver}/%{name}-%{version}.tar.gz @@ -79,6 +79,9 @@ rm %{buildroot}/%{_sysconfdir}/ha.d/resource.d/iprha %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 2.4.19-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Aug 07 2024 Miroslav Suchý - 2.4.19-14 - convert license to SPDX From 81c60cdbb36957071f1fd415cfb70a2f6b8b9838 Mon Sep 17 00:00:00 2001 From: Jakub Haruda Date: Tue, 15 Jul 2025 14:56:45 +0200 Subject: [PATCH 3/4] Convert STI to TMT --- .fmf/version | 1 + plans/basic.fmf | 11 ++++ tests/basic-functionality-test/Makefile | 65 ------------------- tests/basic-functionality-test/PURPOSE | 11 ---- tests/sanity/main.fmf | 24 +++++++ .../runtest.sh | 1 - tests/tests.yml | 13 ---- 7 files changed, 36 insertions(+), 90 deletions(-) create mode 100644 .fmf/version create mode 100644 plans/basic.fmf delete mode 100644 tests/basic-functionality-test/Makefile delete mode 100644 tests/basic-functionality-test/PURPOSE create mode 100644 tests/sanity/main.fmf rename tests/{basic-functionality-test => sanity}/runtest.sh (99%) 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/basic.fmf b/plans/basic.fmf new file mode 100644 index 0000000..b5711c6 --- /dev/null +++ b/plans/basic.fmf @@ -0,0 +1,11 @@ +--- +/: + inherit: false + +summary: Plan for running all tests + +discover: + how: fmf +execute: + how: tmt + diff --git a/tests/basic-functionality-test/Makefile b/tests/basic-functionality-test/Makefile deleted file mode 100644 index 5530481..0000000 --- a/tests/basic-functionality-test/Makefile +++ /dev/null @@ -1,65 +0,0 @@ -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Makefile of /CoreOS/patch/Regression/Cannot-handle-file-names-with-integrated-spaces -# Description: Test for bz431887 (Cannot handle file names with integrated spaces) -# Author: Ondrej Moris -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2010 Red Hat, Inc. All rights reserved. -# -# This copyrighted material is made available to anyone wishing -# to use, modify, copy, or redistribute it subject to the terms -# and conditions of the GNU General Public License version 2. -# -# This program is distributed in the hope that it will be -# useful, but WITHOUT ANY WARRANTY; without even the implied -# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -# PURPOSE. See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public -# License along with this program; if not, write to the Free -# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -export TEST=/CoreOS/patch/Regression/Cannot-handle-file-names-with-integrated-spaces -export TESTVERSION=1.0 - -BUILT_FILES= - -FILES=$(METADATA) runtest.sh Makefile PURPOSE - -.PHONY: all install download clean - -run: $(FILES) build - ./runtest.sh - -build: $(BUILT_FILES) - chmod a+x runtest.sh - -clean: - rm -f *~ $(BUILT_FILES) - - -include /usr/share/rhts/lib/rhts-make.include - -$(METADATA): Makefile - @echo "Owner: Ondrej Moris " > $(METADATA) - @echo "Name: $(TEST)" >> $(METADATA) - @echo "TestVersion: $(TESTVERSION)" >> $(METADATA) - @echo "Path: $(TEST_DIR)" >> $(METADATA) - @echo "Description: Test for bz431887 (Cannot handle file names with integrated spaces)" >> $(METADATA) - @echo "Type: Regression" >> $(METADATA) - @echo "TestTime: 5m" >> $(METADATA) - @echo "RunFor: patch" >> $(METADATA) - @echo "Requires: patch" >> $(METADATA) - @echo "Requires: expect" >> $(METADATA) - @echo "Priority: Normal" >> $(METADATA) - @echo "License: GPLv2" >> $(METADATA) - @echo "Confidential: no" >> $(METADATA) - @echo "Destructive: no" >> $(METADATA) - @echo "Bug: 431887" >> $(METADATA) - - rhts-lint $(METADATA) diff --git a/tests/basic-functionality-test/PURPOSE b/tests/basic-functionality-test/PURPOSE deleted file mode 100644 index 4d05a09..0000000 --- a/tests/basic-functionality-test/PURPOSE +++ /dev/null @@ -1,11 +0,0 @@ -PURPOSE of /CoreOS/iprutils/basic-functionality-test -Description: Tier1 tests -Author: Than Ngo - -tests following scenarios: - * test iprdump --version - * test iprinit --version - * test iprupdate --version - * test Services: iprdump, iprinit, iprupdate - * test existence of man pages - * test existence of license and readme file diff --git a/tests/sanity/main.fmf b/tests/sanity/main.fmf new file mode 100644 index 0000000..b0aef71 --- /dev/null +++ b/tests/sanity/main.fmf @@ -0,0 +1,24 @@ +summary: Test for bz431887 (Cannot handle file names with integrated spaces) +description: "tests following scenarios:\n * test iprdump --version\n * test iprinit + --version\n * test iprupdate --version\n * test Services: iprdump, iprinit, iprupdate\n\ + \ * test existence of man pages\n * test existence of license and readme file\ + \ \n" +contact: Ondrej Moris +link: + - relates: https://bugzilla.redhat.com/show_bug.cgi?id=431887 +component: + - patch +test: ./runtest.sh +framework: beakerlib +recommend: + - iprutils + - patch + - expect + - man-db + - coreutils + - rpm +duration: 5m +extra-summary: + /CoreOS/patch/Regression/Cannot-handle-file-names-with-integrated-spaces +extra-task: + /CoreOS/patch/Regression/Cannot-handle-file-names-with-integrated-spaces diff --git a/tests/basic-functionality-test/runtest.sh b/tests/sanity/runtest.sh similarity index 99% rename from tests/basic-functionality-test/runtest.sh rename to tests/sanity/runtest.sh index b16a304..2cc274e 100755 --- a/tests/basic-functionality-test/runtest.sh +++ b/tests/sanity/runtest.sh @@ -30,7 +30,6 @@ PACKAGES="iprutils man-db coreutils rpm" SERVICES="iprdump iprinit iprupdate" # Include Beaker environment -. /usr/bin/rhts-environment.sh || exit 1 . /usr/share/beakerlib/beakerlib.sh || exit 1 rlJournalStart diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index 7619f5f..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,13 +0,0 @@ ---- -# Run tests in all contexts -- hosts: localhost - tags: - - classic - roles: - - role: standard-test-beakerlib - tests: - - basic-functionality-test - required_packages: - - man-db - - coreutils - - rpm From f40acc53aa4c16da13c8bd167848a9b90ac5a677 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 17:45:44 +0000 Subject: [PATCH 4/4] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- iprutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/iprutils.spec b/iprutils.spec index 95b3c8b..fb01523 100644 --- a/iprutils.spec +++ b/iprutils.spec @@ -3,7 +3,7 @@ Summary: Utilities for the IBM Power Linux RAID adapters Name: iprutils Version: 2.4.19 -Release: 15%{?dist} +Release: 16%{?dist} License: CPL-1.0 URL: https://github.com/bjking1/iprutils Source0: https://github.com/bjking1/iprutils/archive/%{gitver}/%{name}-%{version}.tar.gz @@ -79,6 +79,9 @@ rm %{buildroot}/%{_sysconfdir}/ha.d/resource.d/iprha %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 2.4.19-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Fri Jan 17 2025 Fedora Release Engineering - 2.4.19-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild