pool/kubevirt
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1138241 from home:vulyanov:branches:Virtualization

Browse Source 
- Fix test with initially invalid DataVolume (bsc#1218174)
  0001-tests-Adapt-VM-phase-expectation.patch

OBS-URL: https://build.opensuse.org/request/show/1138241
OBS-URL: https://build.opensuse.org/package/show/Virtualization/kubevirt?expand=0&rev=147
This commit is contained in:
Vasily Ulyanov 2024-01-12 08:40:12 +00:00 committed by Git OBS Bridge
parent d8c4a95de4
commit ae4ea76c29
3 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
0001-tests-Adapt-VM-phase-expectation.patch Normal file
View File

@ -0,0 +1,29 @@
From aa6647c263408bdf0518d74da2d4c37d3bb42de0 Mon Sep 17 00:00:00 2001
From: Vasiliy Ulyanov <vulyanov@suse.de>
Date: Wed, 13 Dec 2023 08:10:37 +0100
Subject: [PATCH] tests: Adapt VM phase expectation
When CDI uses volume populators with malformed DataVolume, the VM
initially transitions to Scheduling phase.
Signed-off-by: Vasiliy Ulyanov <vulyanov@suse.de>
---
tests/storage/datavolume.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/storage/datavolume.go b/tests/storage/datavolume.go
index 46677257d..9d86d0eac 100644
--- a/tests/storage/datavolume.go
+++ b/tests/storage/datavolume.go
@@ -536,7 +536,7 @@ var _ = SIGDescribe("DataVolume Integration", func() {
vm, err = virtClient.VirtualMachine(vm.Namespace).Create(context.Background(), vm)
Expect(err).ToNot(HaveOccurred())
- Eventually(ThisVMIWith(vm.Namespace, vm.Name), 100).Should(BeInPhase(v1.Pending))
+ Eventually(ThisVMIWith(vm.Namespace, vm.Name), 100).Should(Or(BeInPhase(v1.Pending), BeInPhase(v1.Scheduling)))
By("Creating a service which makes the registry reachable")
_, err = virtClient.CoreV1().Services(vm.Namespace).Create(context.Background(), &k8sv1.Service{
--
2.43.0

6
kubevirt.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Jan 12 06:27:45 UTC 2024 - Vasily Ulyanov <vasily.ulyanov@suse.com>
- Fix test with initially invalid DataVolume (bsc#1218174)
0001-tests-Adapt-VM-phase-expectation.patch
-------------------------------------------------------------------
Thu Jan 4 06:47:58 UTC 2024 - Vasily Ulyanov <vasily.ulyanov@suse.com>

1
kubevirt.spec
View File

@ -41,6 +41,7 @@ Source1: kubevirt_containers_meta
Source2: kubevirt_containers_meta.service
Source3: %{url}/releases/download/v%{version}/disks-images-provider.yaml
Source100: %{name}-rpmlintrc
Patch1: 0001-tests-Adapt-VM-phase-expectation.patch
BuildRequires: glibc-devel-static
BuildRequires: golang-packaging
BuildRequires: pkgconfig