Skip to content

test(vm): port VM placement scenarios to new framework #2268

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danilrwx merged 12 commits into from
Apr 24, 2026
Merged

test(vm): port VM placement scenarios to new framework #2268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
49ae289
test(e2e): port VM affinity placement test to new framework
danilrwx Apr 23, 2026
937a887
test(e2e): port remaining VM placement scenarios
danilrwx Apr 23, 2026
5fc41a0
fix(e2e): preserve target node in placement tests
danilrwx Apr 23, 2026
6087bb4
fix(vm): pass context in migration skip checks
danilrwx Apr 23, 2026
7e1c966
fix(vm): address affinity placement review comments
danilrwx Apr 23, 2026
947ee17
refactor(vm): inline placement disk creation
danilrwx Apr 24, 2026
74b5dec
fix(vm): stabilize repeated affinity migration check
danilrwx Apr 24, 2026
ed13159
fix(vm): handle removed migrating condition
danilrwx Apr 24, 2026
4846d93
fix(vm): wait for active pod readiness after migration
danilrwx Apr 24, 2026
753b564
refactor(vm): simplify migration placement checks
danilrwx Apr 24, 2026
7dbf5f0
refactor(vm): wait for migratable after placement migration
danilrwx Apr 24, 2026
5ba5412
refactor(vm): avoid nested eventually in placement checks
danilrwx Apr 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 22 additions & 6 deletions test/e2e/internal/util/vm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,18 @@ func IsKnownKubeVirtClientSocketClosedFailureReason(reason string) bool {

// TODO: remove temporary migration skip logic when issue "client socket is closed" is fixed:
func SkipIfKnownKubeVirtClientSocketClosedMigrationFailure(vm *v1alpha2.VirtualMachine) {
SkipIfKnownKubeVirtClientSocketClosedMigrationFailureWithContext(context.Background(), vm)
}

// TODO: remove temporary migration skip logic when issue "client socket is closed" is fixed:
func SkipIfKnownKubeVirtClientSocketClosedMigrationFailureWithContext(ctx context.Context, vm *v1alpha2.VirtualMachine) {
GinkgoHelper()

if vm == nil {
return
}

intvirtvmi, err := getInternalVirtualMachineInstance(vm)
intvirtvmi, err := getInternalVirtualMachineInstance(ctx, vm)
Expect(err).NotTo(HaveOccurred())
if intvirtvmi == nil || intvirtvmi.Status.MigrationState == nil {
return
Expand All @@ -77,13 +82,18 @@ func IsKnownVolumesUpdateFailureReason(reason string) bool {

// TODO: remove temporary migration skip logic when known issue "VolumesUpdateError" is fixed:
func SkipIfKnownVolumesUpdateMigrationFailure(vm *v1alpha2.VirtualMachine) {
SkipIfKnownVolumesUpdateMigrationFailureWithContext(context.Background(), vm)
}

// TODO: remove temporary migration skip logic when known issue "VolumesUpdateError" is fixed:
func SkipIfKnownVolumesUpdateMigrationFailureWithContext(ctx context.Context, vm *v1alpha2.VirtualMachine) {
GinkgoHelper()

if vm == nil {
return
}

intvirtvmi, err := getInternalVirtualMachineInstance(vm)
intvirtvmi, err := getInternalVirtualMachineInstance(ctx, vm)
Expect(err).NotTo(HaveOccurred())
if intvirtvmi == nil {
return
Expand All @@ -100,10 +110,16 @@ func SkipIfKnownVolumesUpdateMigrationFailure(vm *v1alpha2.VirtualMachine) {
// TODO: remove temporary migration skip logic when both known issues are fixed:
// kubevirt "client socket is closed" and VolumesUpdateError.
func SkipIfKnownMigrationFailure(vm *v1alpha2.VirtualMachine) {
SkipIfKnownMigrationFailureWithContext(context.Background(), vm)
}

// TODO: remove temporary migration skip logic when both known issues are fixed:
// kubevirt "client socket is closed" and VolumesUpdateError.
func SkipIfKnownMigrationFailureWithContext(ctx context.Context, vm *v1alpha2.VirtualMachine) {
GinkgoHelper()

SkipIfKnownKubeVirtClientSocketClosedMigrationFailure(vm)
SkipIfKnownVolumesUpdateMigrationFailure(vm)
SkipIfKnownKubeVirtClientSocketClosedMigrationFailureWithContext(ctx, vm)
SkipIfKnownVolumesUpdateMigrationFailureWithContext(ctx, vm)
}

// TODO: remove temporary migration skip logic when VD Migration Controller revert issue is fixed:
Expand All @@ -125,11 +141,11 @@ func SkipIfVDMigrationReverted(namespace string) {
}
}

func getInternalVirtualMachineInstance(vm *v1alpha2.VirtualMachine) (*virtv1.VirtualMachineInstance, error) {
func getInternalVirtualMachineInstance(ctx context.Context, vm *v1alpha2.VirtualMachine) (*virtv1.VirtualMachineInstance, error) {
GinkgoHelper()

obj := &rewrite.VirtualMachineInstance{}
err := framework.GetClients().RewriteClient().Get(context.Background(), vm.Name, obj, rewrite.InNamespace(vm.Namespace))
err := framework.GetClients().RewriteClient().Get(ctx, vm.Name, obj, rewrite.InNamespace(vm.Namespace))
if err != nil {
if k8serrors.IsNotFound(err) {
return nil, nil
Expand Down
Loading
Loading