[Pkg-libvirt-commits] [Git][libvirt-team/virt-manager][debian/sid] 2 commits: d/patches: fix tests with newer osinfo-db
Pino Toscano (@pino)
gitlab at salsa.debian.org
Fri Sep 1 21:02:28 BST 2023
Pino Toscano pushed to branch debian/sid at Libvirt Packaging Team / virt-manager
Commits:
35d6d1ee by Pino Toscano at 2023-09-01T21:56:12+02:00
d/patches: fix tests with newer osinfo-db
Closes: #1042147
- - - - -
acf57ac5 by Pino Toscano at 2023-09-01T21:57:43+02:00
Update standards version to 4.6.2, no changes needed.
Changes-By: lintian-brush
Fixes: lintian: out-of-date-standards-version
See-also: https://lintian.debian.org/tags/out-of-date-standards-version.html
- - - - -
3 changed files:
- debian/control
- + debian/patches/series
- + debian/patches/upstream_tests-data-refresh-Fedora-tree-URLs-in-virt-install-.patch
Changes:
=====================================
debian/control
=====================================
@@ -5,7 +5,7 @@ Maintainer: Debian Libvirt Maintainers <pkg-libvirt-maintainers at lists.alioth.deb
Uploaders:
Guido Günther <agx at sigxcpu.org>,
Pino Toscano <pino at debian.org>,
-Standards-Version: 4.6.1
+Standards-Version: 4.6.2
Vcs-Git: https://salsa.debian.org/libvirt-team/virt-manager.git
Vcs-Browser: https://salsa.debian.org/libvirt-team/virt-manager
Homepage: https://virt-manager.org/
=====================================
debian/patches/series
=====================================
@@ -0,0 +1 @@
+upstream_tests-data-refresh-Fedora-tree-URLs-in-virt-install-.patch
=====================================
debian/patches/upstream_tests-data-refresh-Fedora-tree-URLs-in-virt-install-.patch
=====================================
@@ -0,0 +1,73 @@
+From 6e5c1db6b4a0af96afeb09a09fb2fc2b73308f01 Mon Sep 17 00:00:00 2001
+From: Laszlo Ersek <lersek at redhat.com>
+Date: Sun, 27 Aug 2023 09:19:09 +0200
+Subject: [PATCH] tests/data: refresh Fedora tree URLs in virt-install-osinfo*
+ expected XMLs
+
+Libosinfo seems to generate Fedora tree URLs using the "https", not
+"http", scheme now; which breaks CI. Update the expected outputs
+accordingly.
+
+Signed-off-by: Laszlo Ersek <lersek at redhat.com>
+---
+ .../cli/compare/virt-install-osinfo-unattended-treeapis.xml | 2 +-
+ tests/data/cli/compare/virt-install-osinfo-url-unattended.xml | 2 +-
+ tests/data/cli/compare/virt-install-osinfo-url-with-disk.xml | 2 +-
+ tests/data/cli/compare/virt-install-osinfo-url.xml | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/tests/data/cli/compare/virt-install-osinfo-unattended-treeapis.xml b/tests/data/cli/compare/virt-install-osinfo-unattended-treeapis.xml
+index 1140bf0b..5f3c3474 100644
+--- a/tests/data/cli/compare/virt-install-osinfo-unattended-treeapis.xml
++++ b/tests/data/cli/compare/virt-install-osinfo-unattended-treeapis.xml
+@@ -13,7 +13,7 @@
+ <type arch="x86_64" machine="pc-i440fx-6.1">hvm</type>
+ <kernel>/VIRTINST-TESTSUITE/vmlinuz</kernel>
+ <initrd>/VIRTINST-TESTSUITE/initrd.img</initrd>
+- <cmdline>ks=file:/fedora.ks method=http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/17/Fedora/x86_64/os/</cmdline>
++ <cmdline>ks=file:/fedora.ks method=https://archive.fedoraproject.org/pub/archive/fedora/linux/releases/17/Fedora/x86_64/os/</cmdline>
+ </os>
+ <features>
+ <acpi/>
+diff --git a/tests/data/cli/compare/virt-install-osinfo-url-unattended.xml b/tests/data/cli/compare/virt-install-osinfo-url-unattended.xml
+index fe653b8b..2388120a 100644
+--- a/tests/data/cli/compare/virt-install-osinfo-url-unattended.xml
++++ b/tests/data/cli/compare/virt-install-osinfo-url-unattended.xml
+@@ -13,7 +13,7 @@
+ <type arch="x86_64" machine="q35">hvm</type>
+ <kernel>/VIRTINST-TESTSUITE/vmlinuz</kernel>
+ <initrd>/VIRTINST-TESTSUITE/initrd.img</initrd>
+- <cmdline>ks=file:/fedora.ks inst.repo=http://archives.fedoraproject.org/pub/archive/fedora/linux/releases/26/Server/x86_64/os/</cmdline>
++ <cmdline>ks=file:/fedora.ks inst.repo=https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/26/Server/x86_64/os/</cmdline>
+ </os>
+ <features>
+ <acpi/>
+diff --git a/tests/data/cli/compare/virt-install-osinfo-url-with-disk.xml b/tests/data/cli/compare/virt-install-osinfo-url-with-disk.xml
+index 99fb90fb..11fce0aa 100644
+--- a/tests/data/cli/compare/virt-install-osinfo-url-with-disk.xml
++++ b/tests/data/cli/compare/virt-install-osinfo-url-with-disk.xml
+@@ -13,7 +13,7 @@
+ <type arch="x86_64" machine="q35">hvm</type>
+ <kernel>/VIRTINST-TESTSUITE/vmlinuz</kernel>
+ <initrd>/VIRTINST-TESTSUITE/initrd.img</initrd>
+- <cmdline>method=http://archives.fedoraproject.org/pub/archive/fedora/linux/releases/26/Server/x86_64/os/</cmdline>
++ <cmdline>method=https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/26/Server/x86_64/os/</cmdline>
+ </os>
+ <features>
+ <acpi/>
+diff --git a/tests/data/cli/compare/virt-install-osinfo-url.xml b/tests/data/cli/compare/virt-install-osinfo-url.xml
+index 37fcc109..ea1937a3 100644
+--- a/tests/data/cli/compare/virt-install-osinfo-url.xml
++++ b/tests/data/cli/compare/virt-install-osinfo-url.xml
+@@ -13,7 +13,7 @@
+ <type arch="x86_64" machine="q35">hvm</type>
+ <kernel>/VIRTINST-TESTSUITE/vmlinuz</kernel>
+ <initrd>/VIRTINST-TESTSUITE/initrd.img</initrd>
+- <cmdline>method=http://archives.fedoraproject.org/pub/archive/fedora/linux/releases/26/Server/x86_64/os/</cmdline>
++ <cmdline>method=https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/26/Server/x86_64/os/</cmdline>
+ </os>
+ <features>
+ <acpi/>
+--
+2.40.1
+
View it on GitLab: https://salsa.debian.org/libvirt-team/virt-manager/-/compare/4f0c2d4f95edae599d4bf536d2ee72709d9d59a5...acf57ac50eecffb8d223df1cf08c01d1b1c43d12
--
View it on GitLab: https://salsa.debian.org/libvirt-team/virt-manager/-/compare/4f0c2d4f95edae599d4bf536d2ee72709d9d59a5...acf57ac50eecffb8d223df1cf08c01d1b1c43d12
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-libvirt-commits/attachments/20230901/2213b716/attachment-0001.htm>
More information about the Pkg-libvirt-commits
mailing list