Skip to content

Commit 7634dc8

Browse files
fix
Signed-off-by: Yaroslav Borbat <yaroslav.borbat@flant.com>
1 parent 108d0ac commit 7634dc8

8 files changed

Lines changed: 51 additions & 1 deletion

File tree

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
apiVersion: virtualization.deckhouse.io/v1alpha2
2+
kind: ClusterVirtualImage
3+
metadata:
4+
name: cvi-cirros
5+
spec:
6+
dataSource:
7+
type: "HTTP"
8+
http:
9+
url: "https://89d64382-20df-4581-8cc7-80df331f67fa.selstorage.ru/cirros/cirros-0.5.1.qcow2"
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
3+
resources:
4+
- cvi-cirros.yaml
5+

tests/e2e/testdata/vm-migration/kustomization.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ namespace: testcases
44
namePrefix: pr-number-or-commit-hash-
55
resources:
66
- vi
7+
- cvi
78
- vm
89
- ns.yaml
910
configurations:

tests/e2e/testdata/vm-migration/vm/kustomization.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ kind: Kustomization
33
resources:
44
- overlays/migration-bios
55
- overlays/migration-uefi
6+
- overlays/with-cvi
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
3+
nameSuffix: -migration-with-cvi
4+
resources:
5+
- ../../base
6+
patches:
7+
- path: vd.image.patch.yaml
8+
- path: vm.bootloader.patch.yaml
9+
- patch: |-
10+
- op: add
11+
path: /spec/blockDeviceRefs/-
12+
value: {
13+
"kind": "ClusterVirtualImage",
14+
"name": "cvi-cirros"
15+
}
16+
target:
17+
kind: VirtualMachine
18+
name: vm
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
apiVersion: virtualization.deckhouse.io/v1alpha2
2+
kind: VirtualDisk
3+
metadata:
4+
name: vd-root
5+
spec:
6+
dataSource:
7+
type: ObjectRef
8+
objectRef:
9+
kind: VirtualImage
10+
name: vi-alpine-http-uefi
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
apiVersion: virtualization.deckhouse.io/v1alpha2
2+
kind: VirtualMachine
3+
metadata:
4+
name: vm
5+
spec:
6+
bootloader: EFI

tests/e2e/vm_migration_cancel_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import (
3333
kc "github.com/deckhouse/virtualization/tests/e2e/kubectl"
3434
)
3535

36-
var _ = Describe("Virtual machine migration cancel", SIGMigration(), ginkgoutil.CommonE2ETestDecorators(), func() {
36+
var _ = Describe("Virtual machine cancel migration", SIGMigration(), ginkgoutil.CommonE2ETestDecorators(), func() {
3737
testCaseLabel := map[string]string{"testcase": "vm-migration-cancel"}
3838

3939
BeforeEach(func() {

0 commit comments

Comments
 (0)