From 3dbfbb456a57b71c6ba26184776e6f33a4b6092b Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 3 Aug 2022 17:34:53 +0100 Subject: [PATCH 01/14] Add gating tests for RHEL 9 https://bugzilla.redhat.com/show_bug.cgi?id=1990052 --- .gitignore | 1 + gating.yaml | 6 ++++++ tests/basic-test.sh | 19 +++++++++++++++++++ tests/tests.yml | 12 ++++++++++++ 4 files changed, 38 insertions(+) create mode 100755 gating.yaml create mode 100755 tests/basic-test.sh create mode 100755 tests/tests.yml diff --git a/.gitignore b/.gitignore index 0e4e29b..963ba8c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ +*~ /virt-p2v-*.tar.gz /virt-p2v-*.tar.gz.sig diff --git a/gating.yaml b/gating.yaml new file mode 100755 index 0000000..648918d --- /dev/null +++ b/gating.yaml @@ -0,0 +1,6 @@ +--- !Policy +product_versions: + - rhel-9 +decision_context: osci_compose_gate +rules: + - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional} diff --git a/tests/basic-test.sh b/tests/basic-test.sh new file mode 100755 index 0000000..02e44be --- /dev/null +++ b/tests/basic-test.sh @@ -0,0 +1,19 @@ +#!/bin/bash - +set -e +set -x + +# This is a difficult package to test in gating because building the +# virt-p2v ISO requires virt-builder, and even if we run it, it +# doesn't prove anything useful. Doing a full P2V conversion is even +# more difficult (and requires virt-v2v which we are unlikely to +# have). So just check that the virt-p2v binary looks sane. +tmpdir="$( mktemp -d )" +cd "$tmpdir" +xzcat /usr/lib64/virt-p2v/virt-p2v.xz > virt-p2v +chmod +x virt-p2v +./virt-p2v --version +./virt-p2v --help +./virt-p2v --long-options +./virt-p2v --short-options +cd +rm -r "$tmpdir" diff --git a/tests/tests.yml b/tests/tests.yml new file mode 100755 index 0000000..9ae7bc3 --- /dev/null +++ b/tests/tests.yml @@ -0,0 +1,12 @@ +- hosts: localhost + roles: + - role: standard-test-basic + tags: + - classic + required_packages: + - coreutils + - virt-p2v + tests: + - simple: + dir: . + run: ./basic-test.sh From c80321a700ae75c8fd80072fdd12e97b69e01a74 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 3 Aug 2022 18:14:33 +0100 Subject: [PATCH 02/14] Add extra dependencies needed by the gating test --- tests/tests.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tests/tests.yml b/tests/tests.yml index 9ae7bc3..2d42e7a 100755 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -4,8 +4,14 @@ tags: - classic required_packages: - - coreutils - virt-p2v + # https://github.com/libguestfs/virt-p2v/blob/master/dependencies.m4 + # Only need the virt-p2v program dependencies. + # There's no way that I'm aware of to build this list automatically. + - dbus-libs + - gtk3 + - libxml2 + - pcre2 tests: - simple: dir: . From 6eff731b16a701ea5c66bdb262304c92feab8279 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 3 Aug 2022 18:16:27 +0100 Subject: [PATCH 03/14] Add back coreutils, wrongly dropped in previous commit --- tests/tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/tests.yml b/tests/tests.yml index 2d42e7a..3261a65 100755 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -4,6 +4,7 @@ tags: - classic required_packages: + - coreutils - virt-p2v # https://github.com/libguestfs/virt-p2v/blob/master/dependencies.m4 # Only need the virt-p2v program dependencies. From 1e9ea138478d613f7d9e0ed7b79438ec2d34e8c2 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 11 Oct 2022 16:47:36 +0100 Subject: [PATCH 04/14] New upstream release 1.42.3 --- sources | 4 ++-- virt-p2v.spec | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 26e9b27..404e7d6 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (virt-p2v-1.42.2.tar.gz) = 5310c4b09bfbb4652ae73dadc3906d8fbc2f3183cc9b1e90fc5bd5e159469f4fb3d74a710cb76f2ec65c2a55c219cd7425c2eaa4993f0152dc19fde68cc2e5c4 -SHA512 (virt-p2v-1.42.2.tar.gz.sig) = b13c788bf71a75b1ed23262af33014f99e26f7b5462cdc14c1194347a7748975f92b4336a7757dd4e42269b975f26d9206c29e080b40ef190ce41671aef7a793 +SHA512 (virt-p2v-1.42.3.tar.gz) = 36d244b9baa7307e3e2413c975263238a3fcfbc0c396d74141177dd929cb6a725b7fe1187372b7eac7eef774538521b6d5d0a7d91eab5bd20510415d86991289 +SHA512 (virt-p2v-1.42.3.tar.gz.sig) = f8f46be2d6b1d17feddfd24b1a46fe835d004b6ba1deb4fb7c823a50d4f4a8f40ee19b806d3f33c0a64515034f06f763670671d3dec3dc42ddbea2fb78dd848d diff --git a/virt-p2v.spec b/virt-p2v.spec index 8daff0a..8130e90 100644 --- a/virt-p2v.spec +++ b/virt-p2v.spec @@ -9,7 +9,7 @@ Summary: Convert a physical machine to run on KVM Name: virt-p2v Epoch: 1 -Version: 1.42.2 +Version: 1.42.3 Release: 1%{?dist} License: GPLv2+ @@ -119,6 +119,9 @@ rm $RPM_BUILD_ROOT%{_mandir}/man1/p2v-release-notes.1* %changelog +* Tue Oct 11 2022 Richard W.M. Jones - 1:1.42.3-1 +- New upstream release 1.42.3 + * Wed Aug 03 2022 Richard W.M. Jones - 1:1.42.2-1 - New upstream release 1.42.2 - Uses PCRE2 instead of PCRE. From 034f1f8a80ce9cca231eb1fbf3d661862cd97666 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 06:23:25 +0000 Subject: [PATCH 05/14] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- virt-p2v.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/virt-p2v.spec b/virt-p2v.spec index 8130e90..8c20780 100644 --- a/virt-p2v.spec +++ b/virt-p2v.spec @@ -10,7 +10,7 @@ Summary: Convert a physical machine to run on KVM Name: virt-p2v Epoch: 1 Version: 1.42.3 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ # virt-p2v works only on x86_64 at the moment. It requires porting @@ -119,6 +119,9 @@ rm $RPM_BUILD_ROOT%{_mandir}/man1/p2v-release-notes.1* %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 1:1.42.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Tue Oct 11 2022 Richard W.M. Jones - 1:1.42.3-1 - New upstream release 1.42.3 From c8b68f380dbc6e239092f5e53a8f229bf96db43b Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 5 Jun 2023 16:07:53 +0100 Subject: [PATCH 06/14] Migrated to SPDX license --- virt-p2v.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/virt-p2v.spec b/virt-p2v.spec index 8c20780..ffe1ea3 100644 --- a/virt-p2v.spec +++ b/virt-p2v.spec @@ -10,8 +10,8 @@ Summary: Convert a physical machine to run on KVM Name: virt-p2v Epoch: 1 Version: 1.42.3 -Release: 2%{?dist} -License: GPLv2+ +Release: 3%{?dist} +License: GPL-2.0-or-later AND LGPL-2.0-or-later # virt-p2v works only on x86_64 at the moment. It requires porting # to properly detect the hardware on other architectures, and furthermore @@ -119,6 +119,9 @@ rm $RPM_BUILD_ROOT%{_mandir}/man1/p2v-release-notes.1* %changelog +* Mon Jun 05 2023 Richard W.M. Jones - 1:1.42.3-3 +- Migrated to SPDX license + * Sat Jan 21 2023 Fedora Release Engineering - 1:1.42.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 4edbdad98506e88e51e8a0e8c5dec333e456000f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 17:44:36 +0000 Subject: [PATCH 07/14] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- virt-p2v.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/virt-p2v.spec b/virt-p2v.spec index ffe1ea3..e9b17ef 100644 --- a/virt-p2v.spec +++ b/virt-p2v.spec @@ -10,7 +10,7 @@ Summary: Convert a physical machine to run on KVM Name: virt-p2v Epoch: 1 Version: 1.42.3 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL-2.0-or-later AND LGPL-2.0-or-later # virt-p2v works only on x86_64 at the moment. It requires porting @@ -119,6 +119,9 @@ rm $RPM_BUILD_ROOT%{_mandir}/man1/p2v-release-notes.1* %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 1:1.42.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Mon Jun 05 2023 Richard W.M. Jones - 1:1.42.3-3 - Migrated to SPDX license From 9cd8e5a7f24c4ef9c8dd6952c03436dbc90c8cc0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 07:57:35 +0000 Subject: [PATCH 08/14] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- virt-p2v.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/virt-p2v.spec b/virt-p2v.spec index e9b17ef..72b951a 100644 --- a/virt-p2v.spec +++ b/virt-p2v.spec @@ -10,7 +10,7 @@ Summary: Convert a physical machine to run on KVM Name: virt-p2v Epoch: 1 Version: 1.42.3 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL-2.0-or-later AND LGPL-2.0-or-later # virt-p2v works only on x86_64 at the moment. It requires porting @@ -119,6 +119,9 @@ rm $RPM_BUILD_ROOT%{_mandir}/man1/p2v-release-notes.1* %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 1:1.42.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 1:1.42.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 295a5004108bdc1c64a3693b0c4742da45ac901f Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 25 Mar 2024 11:17:37 +0000 Subject: [PATCH 09/14] Use %{bash_completions_dir} macro --- virt-p2v.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/virt-p2v.spec b/virt-p2v.spec index 72b951a..1a41699 100644 --- a/virt-p2v.spec +++ b/virt-p2v.spec @@ -10,7 +10,7 @@ Summary: Convert a physical machine to run on KVM Name: virt-p2v Epoch: 1 Version: 1.42.3 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL-2.0-or-later AND LGPL-2.0-or-later # virt-p2v works only on x86_64 at the moment. It requires porting @@ -109,7 +109,7 @@ rm $RPM_BUILD_ROOT%{_mandir}/man1/p2v-release-notes.1* %{_bindir}/virt-p2v-make-disk %{_bindir}/virt-p2v-make-kickstart %{_bindir}/virt-p2v-make-kiwi -%{_datadir}/bash-completion/completions/virt-* +%{bash_completions_dir}/virt-* %{_datadir}/virt-p2v %{_libdir}/virt-p2v %{_mandir}/man1/virt-p2v-make-disk.1* @@ -119,6 +119,9 @@ rm $RPM_BUILD_ROOT%{_mandir}/man1/p2v-release-notes.1* %changelog +* Mon Mar 25 2024 Richard W.M. Jones - 1:1.42.3-6 +- Use %%{bash_completions_dir} macro + * Sat Jan 27 2024 Fedora Release Engineering - 1:1.42.3-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 582c1d6e2b5f07cc2c26d5d4e9b18f827951c420 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 25 Mar 2024 11:30:36 +0000 Subject: [PATCH 10/14] BR bash-completion-devel (new in Rawhide) --- virt-p2v.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/virt-p2v.spec b/virt-p2v.spec index 1a41699..236fba4 100644 --- a/virt-p2v.spec +++ b/virt-p2v.spec @@ -39,7 +39,7 @@ BuildRequires: perl(List::MoreUtils) BuildRequires: /usr/bin/pod2text BuildRequires: libxml2-devel BuildRequires: pcre2-devel -BuildRequires: bash-completion +BuildRequires: bash-completion-devel BuildRequires: xz BuildRequires: gtk3-devel BuildRequires: dbus-devel @@ -121,6 +121,7 @@ rm $RPM_BUILD_ROOT%{_mandir}/man1/p2v-release-notes.1* %changelog * Mon Mar 25 2024 Richard W.M. Jones - 1:1.42.3-6 - Use %%{bash_completions_dir} macro +- BR bash-completion-devel (new in Rawhide) * Sat Jan 27 2024 Fedora Release Engineering - 1:1.42.3-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 76ca9ab2f934b0adc487bc243f48ba2c41d75ef1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 08:52:48 +0000 Subject: [PATCH 11/14] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- virt-p2v.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/virt-p2v.spec b/virt-p2v.spec index 236fba4..3229ca8 100644 --- a/virt-p2v.spec +++ b/virt-p2v.spec @@ -10,7 +10,7 @@ Summary: Convert a physical machine to run on KVM Name: virt-p2v Epoch: 1 Version: 1.42.3 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL-2.0-or-later AND LGPL-2.0-or-later # virt-p2v works only on x86_64 at the moment. It requires porting @@ -119,6 +119,9 @@ rm $RPM_BUILD_ROOT%{_mandir}/man1/p2v-release-notes.1* %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 1:1.42.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Mon Mar 25 2024 Richard W.M. Jones - 1:1.42.3-6 - Use %%{bash_completions_dir} macro - BR bash-completion-devel (new in Rawhide) From 721c5fd8cf7ba31c1b15cd34681d36b7ff9b9088 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 5 Nov 2024 11:18:18 +0000 Subject: [PATCH 12/14] New upstream version 1.42.4 --- sources | 4 ++-- virt-p2v.spec | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sources b/sources index 404e7d6..b6fb520 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (virt-p2v-1.42.3.tar.gz) = 36d244b9baa7307e3e2413c975263238a3fcfbc0c396d74141177dd929cb6a725b7fe1187372b7eac7eef774538521b6d5d0a7d91eab5bd20510415d86991289 -SHA512 (virt-p2v-1.42.3.tar.gz.sig) = f8f46be2d6b1d17feddfd24b1a46fe835d004b6ba1deb4fb7c823a50d4f4a8f40ee19b806d3f33c0a64515034f06f763670671d3dec3dc42ddbea2fb78dd848d +SHA512 (virt-p2v-1.42.4.tar.gz) = 282c80c60cf220ad9cc69ceb52a2f22e3edab671ac96a6b1a2391b9c61fe195d05ed0849c582cc27613384d42e8088930026bb0b668727bc8a4036de67b2e74f +SHA512 (virt-p2v-1.42.4.tar.gz.sig) = 0854a12d4aad55629997baf2a388fa2b4efe30fe5793055b3cb58a18f3d291f1dbbb765a9cc3ef85dad8233705e7885b1602e8b0fa59a437d28056dad6d19d6c diff --git a/virt-p2v.spec b/virt-p2v.spec index 3229ca8..7ced0c8 100644 --- a/virt-p2v.spec +++ b/virt-p2v.spec @@ -9,8 +9,8 @@ Summary: Convert a physical machine to run on KVM Name: virt-p2v Epoch: 1 -Version: 1.42.3 -Release: 7%{?dist} +Version: 1.42.4 +Release: 1%{?dist} License: GPL-2.0-or-later AND LGPL-2.0-or-later # virt-p2v works only on x86_64 at the moment. It requires porting @@ -119,6 +119,9 @@ rm $RPM_BUILD_ROOT%{_mandir}/man1/p2v-release-notes.1* %changelog +* Tue Nov 05 2024 Richard W.M. Jones - 1:1.42.4-1 +- New upstream version 1.42.4 + * Sat Jul 20 2024 Fedora Release Engineering - 1:1.42.3-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 3d8c0f5167370d649faf282541f2a5b6e5975bd9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 14:27:58 +0000 Subject: [PATCH 13/14] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- virt-p2v.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/virt-p2v.spec b/virt-p2v.spec index 7ced0c8..33f74a2 100644 --- a/virt-p2v.spec +++ b/virt-p2v.spec @@ -10,7 +10,7 @@ Summary: Convert a physical machine to run on KVM Name: virt-p2v Epoch: 1 Version: 1.42.4 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL-2.0-or-later AND LGPL-2.0-or-later # virt-p2v works only on x86_64 at the moment. It requires porting @@ -119,6 +119,9 @@ rm $RPM_BUILD_ROOT%{_mandir}/man1/p2v-release-notes.1* %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 1:1.42.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Tue Nov 05 2024 Richard W.M. Jones - 1:1.42.4-1 - New upstream version 1.42.4 From e77180cf3fe43ac7d690d9a205867d358653f135 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:08:54 +0000 Subject: [PATCH 14/14] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- virt-p2v.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/virt-p2v.spec b/virt-p2v.spec index 33f74a2..86f8a80 100644 --- a/virt-p2v.spec +++ b/virt-p2v.spec @@ -10,7 +10,7 @@ Summary: Convert a physical machine to run on KVM Name: virt-p2v Epoch: 1 Version: 1.42.4 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL-2.0-or-later AND LGPL-2.0-or-later # virt-p2v works only on x86_64 at the moment. It requires porting @@ -119,6 +119,9 @@ rm $RPM_BUILD_ROOT%{_mandir}/man1/p2v-release-notes.1* %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 1:1.42.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sun Jan 19 2025 Fedora Release Engineering - 1:1.42.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild