diff --git a/benchmark_runner/common/template_operations/templates/windows/internal_data/windows_vm_template.yaml b/benchmark_runner/common/template_operations/templates/windows/internal_data/windows_vm_template.yaml index 8cf81870..a5c0eeb3 100644 --- a/benchmark_runner/common/template_operations/templates/windows/internal_data/windows_vm_template.yaml +++ b/benchmark_runner/common/template_operations/templates/windows/internal_data/windows_vm_template.yaml @@ -6,7 +6,7 @@ metadata: labels: kubevirt.io/vm: windows-{{ kind }}-{{ trunc_uuid }}-{{ scale }} {%- else -%} - name: windows-{{ kind }}-{{ trunc_uuid }} + name: windows-{{ kind }}-{{ trunc_uuid }} labels: kubevirt.io/vm: windows-{{ kind }}-{{ trunc_uuid }} {%- endif %} @@ -26,13 +26,7 @@ spec: kubevirt.io/vm: windows-{{ kind }}-{{ trunc_uuid }} {%- endif %} spec: - terminationGracePeriodSeconds: 0 - evictionStrategy: LiveMigrate domain: - firmware: - bootloader: - efi: - secureBoot: false clock: timer: hpet: @@ -44,46 +38,58 @@ spec: tickPolicy: catchup utc: {} cpu: - cores: 1 model: host-passthrough + cores: 1 sockets: {{ sockets }} threads: 1 devices: + autoattachMemBalloon: false blockMultiQueue: false disks: - - disk: - bus: virtio - {% if scale -%} + - {% if scale -%} name: windows-{{ kind }}-root-disk-{{ trunc_uuid }}-{{ scale }} {%- else -%} name: windows-{{ kind }}-root-disk-{{ trunc_uuid }} {%- endif %} - dedicatedIOThread: false + disk: + bus: virtio + bootOrder: 1 + inputs: + - bus: virtio + name: tablet + type: tablet + tpm: {} interfaces: - - masquerade: {} + - name: nic-0 + masquerade: {} model: virtio - name: nic-0 - networkInterfaceMultiqueue: true - tpm: { } + networkInterfaceMultiqueue: true features: acpi: {} apic: {} hyperv: - frequencies: {} ipi: {} - reenlightenment: {} - tlbflush: {} - relaxed: {} - reset: {} - runtime: {} - spinlocks: - spinlocks: 8191 synic: {} synictimer: - direct: {} - vapic: {} + direct: {} + spinlocks: + spinlocks: 8191 + evmcs: + enabled: true + relaxed: {} vpindex: {} + runtime: {} + tlbflush: {} + frequencies: {} + vapic: {} smm: {} + firmware: + bootloader: + efi: + secureBoot: false + ioThreads: + supplementalPoolThreadCount: 8 + ioThreadsPolicy: supplementalPool machine: type: q35 resources: @@ -93,9 +99,11 @@ spec: limits: cpu: {{ limit_cpu }} memory: {{ limit_memory }} + evictionStrategy: LiveMigrate networks: - name: nic-0 pod: {} + terminationGracePeriodSeconds: 180 volumes: - dataVolume: {% if scale -%} diff --git a/benchmark_runner/common/template_operations/templates/windows/windows_data_template.yaml b/benchmark_runner/common/template_operations/templates/windows/windows_data_template.yaml index a3010c4e..af6715b2 100644 --- a/benchmark_runner/common/template_operations/templates/windows/windows_data_template.yaml +++ b/benchmark_runner/common/template_operations/templates/windows/windows_data_template.yaml @@ -10,14 +10,14 @@ template_data: perf_ci: requests_memory: 2G requests_cpu: 1 - limit_memory: 2G - limit_cpu: 1 + limit_memory: 4G + limit_cpu: 2 sockets: 1 storage: 76Gi default: requests_memory: 2G requests_cpu: 1 - limit_memory: 2G - limit_cpu: 1 + limit_memory: 4G + limit_cpu: 2 sockets: 1 storage: 76Gi diff --git a/benchmark_runner/common/template_operations/templates/winfio/internal_data/winfio_vm_template.yaml b/benchmark_runner/common/template_operations/templates/winfio/internal_data/winfio_vm_template.yaml index 4f92ab39..e31ceab3 100644 --- a/benchmark_runner/common/template_operations/templates/winfio/internal_data/winfio_vm_template.yaml +++ b/benchmark_runner/common/template_operations/templates/winfio/internal_data/winfio_vm_template.yaml @@ -26,13 +26,7 @@ spec: kubevirt.io/vm: winfio-{{ kind }}-{{ trunc_uuid }} {%- endif %} spec: - terminationGracePeriodSeconds: 0 - evictionStrategy: LiveMigrate domain: - firmware: - bootloader: - efi: - secureBoot: false clock: timer: hpet: @@ -49,16 +43,17 @@ spec: sockets: {{ sockets }} threads: 1 devices: + autoattachMemBalloon: false blockMultiQueue: false disks: - - disk: - bus: virtio - {% if scale -%} + - {% if scale -%} name: winfio-{{ kind }}-root-disk-{{ trunc_uuid }}-{{ scale }} {%- else -%} name: winfio-{{ kind }}-root-disk-{{ trunc_uuid }} {%- endif %} - dedicatedIOThread: false + disk: + bus: virtio + bootOrder: 1 - disk: bus: virtio {% if scale -%} @@ -69,40 +64,53 @@ spec: - disk: bus: virtio name: cloudinitdisk + inputs: + - bus: virtio + name: tablet + type: tablet + tpm: {} interfaces: - - masquerade: {} + - name: nic-0 + masquerade: {} model: virtio - name: nic-0 - networkInterfaceMultiqueue: true - tpm: { } + networkInterfaceMultiqueue: true features: acpi: {} apic: {} hyperv: - frequencies: {} ipi: {} - reenlightenment: {} - tlbflush: {} - relaxed: {} - reset: {} - runtime: {} - spinlocks: - spinlocks: 8191 synic: {} synictimer: - direct: {} - vapic: {} + direct: {} + spinlocks: + spinlocks: 8191 + evmcs: + enabled: true + relaxed: {} vpindex: {} + runtime: {} + tlbflush: {} + frequencies: {} + vapic: {} smm: {} + firmware: + bootloader: + efi: + secureBoot: false + ioThreads: + supplementalPoolThreadCount: 8 + ioThreadsPolicy: supplementalPool machine: type: q35 resources: requests: cpu: {{ requests_cpu }} memory: {{ requests_memory }} + evictionStrategy: LiveMigrate networks: - name: nic-0 pod: {} + terminationGracePeriodSeconds: 180 volumes: - dataVolume: {% if scale -%} diff --git a/benchmark_runner/common/template_operations/templates/winmssql/internal_data/winmssql_vm_template.yaml b/benchmark_runner/common/template_operations/templates/winmssql/internal_data/winmssql_vm_template.yaml index 828ae5d8..6859d770 100644 --- a/benchmark_runner/common/template_operations/templates/winmssql/internal_data/winmssql_vm_template.yaml +++ b/benchmark_runner/common/template_operations/templates/winmssql/internal_data/winmssql_vm_template.yaml @@ -26,13 +26,7 @@ spec: kubevirt.io/vm: windows-{{ kind }}-{{ trunc_uuid }} {%- endif %} spec: - terminationGracePeriodSeconds: 0 - evictionStrategy: LiveMigrate domain: - firmware: - bootloader: - efi: - secureBoot: false clock: timer: hpet: @@ -49,16 +43,17 @@ spec: sockets: {{ sockets }} threads: 1 devices: + autoattachMemBalloon: false blockMultiQueue: false disks: - - disk: - bus: virtio - {% if scale -%} + - {% if scale -%} name: windows-{{ kind }}-root-disk-{{ trunc_uuid }}-{{ scale }} {%- else -%} name: windows-{{ kind }}-root-disk-{{ trunc_uuid }} {%- endif %} - dedicatedIOThread: false + disk: + bus: virtio + bootOrder: 1 - disk: bus: virtio {% if scale -%} @@ -69,40 +64,53 @@ spec: - disk: bus: virtio name: cloudinitdisk + inputs: + - bus: virtio + name: tablet + type: tablet + tpm: {} interfaces: - - masquerade: {} + - name: nic-0 + masquerade: {} model: virtio - name: nic-0 - networkInterfaceMultiqueue: true - tpm: { } + networkInterfaceMultiqueue: true features: acpi: {} apic: {} hyperv: - frequencies: {} ipi: {} - reenlightenment: {} - tlbflush: {} - relaxed: {} - reset: {} - runtime: {} - spinlocks: - spinlocks: 8191 synic: {} synictimer: - direct: {} - vapic: {} + direct: {} + spinlocks: + spinlocks: 8191 + evmcs: + enabled: true + relaxed: {} vpindex: {} + runtime: {} + tlbflush: {} + frequencies: {} + vapic: {} smm: {} + firmware: + bootloader: + efi: + secureBoot: false + ioThreads: + supplementalPoolThreadCount: 8 + ioThreadsPolicy: supplementalPool machine: type: q35 resources: requests: cpu: {{ database_requests_cpu }} memory: {{ database_requests_memory }} + evictionStrategy: LiveMigrate networks: - name: nic-0 pod: {} + terminationGracePeriodSeconds: 180 volumes: - dataVolume: {% if scale -%} diff --git a/tests/unittest/benchmark_runner/common/template_operations/golden_files/chaos_ci_windows_vm_ODF_PVC_False/windows_vm.yaml b/tests/unittest/benchmark_runner/common/template_operations/golden_files/chaos_ci_windows_vm_ODF_PVC_False/windows_vm.yaml index 3a15bfd9..e170e38f 100644 --- a/tests/unittest/benchmark_runner/common/template_operations/golden_files/chaos_ci_windows_vm_ODF_PVC_False/windows_vm.yaml +++ b/tests/unittest/benchmark_runner/common/template_operations/golden_files/chaos_ci_windows_vm_ODF_PVC_False/windows_vm.yaml @@ -1,7 +1,7 @@ apiVersion: kubevirt.io/v1 kind: VirtualMachine metadata: - name: windows-vm-deadbeef + name: windows-vm-deadbeef labels: kubevirt.io/vm: windows-vm-deadbeef namespace: benchmark-runner @@ -12,13 +12,7 @@ spec: labels: kubevirt.io/vm: windows-vm-deadbeef spec: - terminationGracePeriodSeconds: 0 - evictionStrategy: LiveMigrate domain: - firmware: - bootloader: - efi: - secureBoot: false clock: timer: hpet: @@ -30,42 +24,54 @@ spec: tickPolicy: catchup utc: {} cpu: - cores: 1 model: host-passthrough + cores: 1 sockets: 1 threads: 1 devices: + autoattachMemBalloon: false blockMultiQueue: false disks: - - disk: + - name: windows-vm-root-disk-deadbeef + disk: bus: virtio - name: windows-vm-root-disk-deadbeef - dedicatedIOThread: false + bootOrder: 1 + inputs: + - bus: virtio + name: tablet + type: tablet + tpm: {} interfaces: - - masquerade: {} + - name: nic-0 + masquerade: {} model: virtio - name: nic-0 - networkInterfaceMultiqueue: true - tpm: { } + networkInterfaceMultiqueue: true features: acpi: {} apic: {} hyperv: - frequencies: {} ipi: {} - reenlightenment: {} - tlbflush: {} - relaxed: {} - reset: {} - runtime: {} - spinlocks: - spinlocks: 8191 synic: {} synictimer: - direct: {} - vapic: {} + direct: {} + spinlocks: + spinlocks: 8191 + evmcs: + enabled: true + relaxed: {} vpindex: {} + runtime: {} + tlbflush: {} + frequencies: {} + vapic: {} smm: {} + firmware: + bootloader: + efi: + secureBoot: false + ioThreads: + supplementalPoolThreadCount: 8 + ioThreadsPolicy: supplementalPool machine: type: q35 resources: @@ -73,11 +79,13 @@ spec: cpu: 1 memory: 2G limits: - cpu: 1 - memory: 2G + cpu: 2 + memory: 4G + evictionStrategy: LiveMigrate networks: - name: nic-0 pod: {} + terminationGracePeriodSeconds: 180 volumes: - dataVolume: name: windows-vm-root-disk-deadbeef diff --git a/tests/unittest/benchmark_runner/common/template_operations/golden_files/chaos_ci_windows_vm_ODF_PVC_True/windows_vm.yaml b/tests/unittest/benchmark_runner/common/template_operations/golden_files/chaos_ci_windows_vm_ODF_PVC_True/windows_vm.yaml index 3a15bfd9..e170e38f 100644 --- a/tests/unittest/benchmark_runner/common/template_operations/golden_files/chaos_ci_windows_vm_ODF_PVC_True/windows_vm.yaml +++ b/tests/unittest/benchmark_runner/common/template_operations/golden_files/chaos_ci_windows_vm_ODF_PVC_True/windows_vm.yaml @@ -1,7 +1,7 @@ apiVersion: kubevirt.io/v1 kind: VirtualMachine metadata: - name: windows-vm-deadbeef + name: windows-vm-deadbeef labels: kubevirt.io/vm: windows-vm-deadbeef namespace: benchmark-runner @@ -12,13 +12,7 @@ spec: labels: kubevirt.io/vm: windows-vm-deadbeef spec: - terminationGracePeriodSeconds: 0 - evictionStrategy: LiveMigrate domain: - firmware: - bootloader: - efi: - secureBoot: false clock: timer: hpet: @@ -30,42 +24,54 @@ spec: tickPolicy: catchup utc: {} cpu: - cores: 1 model: host-passthrough + cores: 1 sockets: 1 threads: 1 devices: + autoattachMemBalloon: false blockMultiQueue: false disks: - - disk: + - name: windows-vm-root-disk-deadbeef + disk: bus: virtio - name: windows-vm-root-disk-deadbeef - dedicatedIOThread: false + bootOrder: 1 + inputs: + - bus: virtio + name: tablet + type: tablet + tpm: {} interfaces: - - masquerade: {} + - name: nic-0 + masquerade: {} model: virtio - name: nic-0 - networkInterfaceMultiqueue: true - tpm: { } + networkInterfaceMultiqueue: true features: acpi: {} apic: {} hyperv: - frequencies: {} ipi: {} - reenlightenment: {} - tlbflush: {} - relaxed: {} - reset: {} - runtime: {} - spinlocks: - spinlocks: 8191 synic: {} synictimer: - direct: {} - vapic: {} + direct: {} + spinlocks: + spinlocks: 8191 + evmcs: + enabled: true + relaxed: {} vpindex: {} + runtime: {} + tlbflush: {} + frequencies: {} + vapic: {} smm: {} + firmware: + bootloader: + efi: + secureBoot: false + ioThreads: + supplementalPoolThreadCount: 8 + ioThreadsPolicy: supplementalPool machine: type: q35 resources: @@ -73,11 +79,13 @@ spec: cpu: 1 memory: 2G limits: - cpu: 1 - memory: 2G + cpu: 2 + memory: 4G + evictionStrategy: LiveMigrate networks: - name: nic-0 pod: {} + terminationGracePeriodSeconds: 180 volumes: - dataVolume: name: windows-vm-root-disk-deadbeef diff --git a/tests/unittest/benchmark_runner/common/template_operations/golden_files/chaos_ci_winfio_vm_ODF_PVC_False/winfio_vm.yaml b/tests/unittest/benchmark_runner/common/template_operations/golden_files/chaos_ci_winfio_vm_ODF_PVC_False/winfio_vm.yaml index f6803b7a..34463ef5 100644 --- a/tests/unittest/benchmark_runner/common/template_operations/golden_files/chaos_ci_winfio_vm_ODF_PVC_False/winfio_vm.yaml +++ b/tests/unittest/benchmark_runner/common/template_operations/golden_files/chaos_ci_winfio_vm_ODF_PVC_False/winfio_vm.yaml @@ -12,13 +12,7 @@ spec: labels: kubevirt.io/vm: winfio-vm-deadbeef spec: - terminationGracePeriodSeconds: 0 - evictionStrategy: LiveMigrate domain: - firmware: - bootloader: - efi: - secureBoot: false clock: timer: hpet: @@ -35,52 +29,66 @@ spec: sockets: 2 threads: 1 devices: + autoattachMemBalloon: false blockMultiQueue: false disks: - - disk: + - name: winfio-vm-root-disk-deadbeef + disk: bus: virtio - name: winfio-vm-root-disk-deadbeef - dedicatedIOThread: false + bootOrder: 1 - disk: bus: virtio name: winfio-vm-data-disk-deadbeef - disk: bus: virtio name: cloudinitdisk + inputs: + - bus: virtio + name: tablet + type: tablet + tpm: {} interfaces: - - masquerade: {} + - name: nic-0 + masquerade: {} model: virtio - name: nic-0 - networkInterfaceMultiqueue: true - tpm: { } + networkInterfaceMultiqueue: true features: acpi: {} apic: {} hyperv: - frequencies: {} ipi: {} - reenlightenment: {} - tlbflush: {} - relaxed: {} - reset: {} - runtime: {} - spinlocks: - spinlocks: 8191 synic: {} synictimer: - direct: {} - vapic: {} + direct: {} + spinlocks: + spinlocks: 8191 + evmcs: + enabled: true + relaxed: {} vpindex: {} + runtime: {} + tlbflush: {} + frequencies: {} + vapic: {} smm: {} + firmware: + bootloader: + efi: + secureBoot: false + ioThreads: + supplementalPoolThreadCount: 8 + ioThreadsPolicy: supplementalPool machine: type: q35 resources: requests: cpu: 1 memory: 4G + evictionStrategy: LiveMigrate networks: - name: nic-0 pod: {} + terminationGracePeriodSeconds: 180 volumes: - dataVolume: name: winfio-vm-root-disk-deadbeef diff --git a/tests/unittest/benchmark_runner/common/template_operations/golden_files/chaos_ci_winfio_vm_ODF_PVC_True/winfio_vm.yaml b/tests/unittest/benchmark_runner/common/template_operations/golden_files/chaos_ci_winfio_vm_ODF_PVC_True/winfio_vm.yaml index f6803b7a..34463ef5 100644 --- a/tests/unittest/benchmark_runner/common/template_operations/golden_files/chaos_ci_winfio_vm_ODF_PVC_True/winfio_vm.yaml +++ b/tests/unittest/benchmark_runner/common/template_operations/golden_files/chaos_ci_winfio_vm_ODF_PVC_True/winfio_vm.yaml @@ -12,13 +12,7 @@ spec: labels: kubevirt.io/vm: winfio-vm-deadbeef spec: - terminationGracePeriodSeconds: 0 - evictionStrategy: LiveMigrate domain: - firmware: - bootloader: - efi: - secureBoot: false clock: timer: hpet: @@ -35,52 +29,66 @@ spec: sockets: 2 threads: 1 devices: + autoattachMemBalloon: false blockMultiQueue: false disks: - - disk: + - name: winfio-vm-root-disk-deadbeef + disk: bus: virtio - name: winfio-vm-root-disk-deadbeef - dedicatedIOThread: false + bootOrder: 1 - disk: bus: virtio name: winfio-vm-data-disk-deadbeef - disk: bus: virtio name: cloudinitdisk + inputs: + - bus: virtio + name: tablet + type: tablet + tpm: {} interfaces: - - masquerade: {} + - name: nic-0 + masquerade: {} model: virtio - name: nic-0 - networkInterfaceMultiqueue: true - tpm: { } + networkInterfaceMultiqueue: true features: acpi: {} apic: {} hyperv: - frequencies: {} ipi: {} - reenlightenment: {} - tlbflush: {} - relaxed: {} - reset: {} - runtime: {} - spinlocks: - spinlocks: 8191 synic: {} synictimer: - direct: {} - vapic: {} + direct: {} + spinlocks: + spinlocks: 8191 + evmcs: + enabled: true + relaxed: {} vpindex: {} + runtime: {} + tlbflush: {} + frequencies: {} + vapic: {} smm: {} + firmware: + bootloader: + efi: + secureBoot: false + ioThreads: + supplementalPoolThreadCount: 8 + ioThreadsPolicy: supplementalPool machine: type: q35 resources: requests: cpu: 1 memory: 4G + evictionStrategy: LiveMigrate networks: - name: nic-0 pod: {} + terminationGracePeriodSeconds: 180 volumes: - dataVolume: name: winfio-vm-root-disk-deadbeef diff --git a/tests/unittest/benchmark_runner/common/template_operations/golden_files/chaos_ci_winmssql_vm_ODF_PVC_False/winmssql_vm.yaml b/tests/unittest/benchmark_runner/common/template_operations/golden_files/chaos_ci_winmssql_vm_ODF_PVC_False/winmssql_vm.yaml index 8b97e020..bd9f953b 100644 --- a/tests/unittest/benchmark_runner/common/template_operations/golden_files/chaos_ci_winmssql_vm_ODF_PVC_False/winmssql_vm.yaml +++ b/tests/unittest/benchmark_runner/common/template_operations/golden_files/chaos_ci_winmssql_vm_ODF_PVC_False/winmssql_vm.yaml @@ -12,13 +12,7 @@ spec: labels: kubevirt.io/vm: windows-vm-deadbeef spec: - terminationGracePeriodSeconds: 0 - evictionStrategy: LiveMigrate domain: - firmware: - bootloader: - efi: - secureBoot: false clock: timer: hpet: @@ -35,52 +29,66 @@ spec: sockets: 16 threads: 1 devices: + autoattachMemBalloon: false blockMultiQueue: false disks: - - disk: + - name: windows-vm-root-disk-deadbeef + disk: bus: virtio - name: windows-vm-root-disk-deadbeef - dedicatedIOThread: false + bootOrder: 1 - disk: bus: virtio name: windows-vm-data-disk-deadbeef - disk: bus: virtio name: cloudinitdisk + inputs: + - bus: virtio + name: tablet + type: tablet + tpm: {} interfaces: - - masquerade: {} + - name: nic-0 + masquerade: {} model: virtio - name: nic-0 - networkInterfaceMultiqueue: true - tpm: { } + networkInterfaceMultiqueue: true features: acpi: {} apic: {} hyperv: - frequencies: {} ipi: {} - reenlightenment: {} - tlbflush: {} - relaxed: {} - reset: {} - runtime: {} - spinlocks: - spinlocks: 8191 synic: {} synictimer: - direct: {} - vapic: {} + direct: {} + spinlocks: + spinlocks: 8191 + evmcs: + enabled: true + relaxed: {} vpindex: {} + runtime: {} + tlbflush: {} + frequencies: {} + vapic: {} smm: {} + firmware: + bootloader: + efi: + secureBoot: false + ioThreads: + supplementalPoolThreadCount: 8 + ioThreadsPolicy: supplementalPool machine: type: q35 resources: requests: cpu: 16 memory: 16G + evictionStrategy: LiveMigrate networks: - name: nic-0 pod: {} + terminationGracePeriodSeconds: 180 volumes: - dataVolume: name: windows-vm-root-disk-deadbeef diff --git a/tests/unittest/benchmark_runner/common/template_operations/golden_files/chaos_ci_winmssql_vm_ODF_PVC_True/winmssql_vm.yaml b/tests/unittest/benchmark_runner/common/template_operations/golden_files/chaos_ci_winmssql_vm_ODF_PVC_True/winmssql_vm.yaml index 8b97e020..bd9f953b 100644 --- a/tests/unittest/benchmark_runner/common/template_operations/golden_files/chaos_ci_winmssql_vm_ODF_PVC_True/winmssql_vm.yaml +++ b/tests/unittest/benchmark_runner/common/template_operations/golden_files/chaos_ci_winmssql_vm_ODF_PVC_True/winmssql_vm.yaml @@ -12,13 +12,7 @@ spec: labels: kubevirt.io/vm: windows-vm-deadbeef spec: - terminationGracePeriodSeconds: 0 - evictionStrategy: LiveMigrate domain: - firmware: - bootloader: - efi: - secureBoot: false clock: timer: hpet: @@ -35,52 +29,66 @@ spec: sockets: 16 threads: 1 devices: + autoattachMemBalloon: false blockMultiQueue: false disks: - - disk: + - name: windows-vm-root-disk-deadbeef + disk: bus: virtio - name: windows-vm-root-disk-deadbeef - dedicatedIOThread: false + bootOrder: 1 - disk: bus: virtio name: windows-vm-data-disk-deadbeef - disk: bus: virtio name: cloudinitdisk + inputs: + - bus: virtio + name: tablet + type: tablet + tpm: {} interfaces: - - masquerade: {} + - name: nic-0 + masquerade: {} model: virtio - name: nic-0 - networkInterfaceMultiqueue: true - tpm: { } + networkInterfaceMultiqueue: true features: acpi: {} apic: {} hyperv: - frequencies: {} ipi: {} - reenlightenment: {} - tlbflush: {} - relaxed: {} - reset: {} - runtime: {} - spinlocks: - spinlocks: 8191 synic: {} synictimer: - direct: {} - vapic: {} + direct: {} + spinlocks: + spinlocks: 8191 + evmcs: + enabled: true + relaxed: {} vpindex: {} + runtime: {} + tlbflush: {} + frequencies: {} + vapic: {} smm: {} + firmware: + bootloader: + efi: + secureBoot: false + ioThreads: + supplementalPoolThreadCount: 8 + ioThreadsPolicy: supplementalPool machine: type: q35 resources: requests: cpu: 16 memory: 16G + evictionStrategy: LiveMigrate networks: - name: nic-0 pod: {} + terminationGracePeriodSeconds: 180 volumes: - dataVolume: name: windows-vm-root-disk-deadbeef diff --git a/tests/unittest/benchmark_runner/common/template_operations/golden_files/func_ci_windows_vm_ODF_PVC_False/windows_vm.yaml b/tests/unittest/benchmark_runner/common/template_operations/golden_files/func_ci_windows_vm_ODF_PVC_False/windows_vm.yaml index 3a15bfd9..e170e38f 100644 --- a/tests/unittest/benchmark_runner/common/template_operations/golden_files/func_ci_windows_vm_ODF_PVC_False/windows_vm.yaml +++ b/tests/unittest/benchmark_runner/common/template_operations/golden_files/func_ci_windows_vm_ODF_PVC_False/windows_vm.yaml @@ -1,7 +1,7 @@ apiVersion: kubevirt.io/v1 kind: VirtualMachine metadata: - name: windows-vm-deadbeef + name: windows-vm-deadbeef labels: kubevirt.io/vm: windows-vm-deadbeef namespace: benchmark-runner @@ -12,13 +12,7 @@ spec: labels: kubevirt.io/vm: windows-vm-deadbeef spec: - terminationGracePeriodSeconds: 0 - evictionStrategy: LiveMigrate domain: - firmware: - bootloader: - efi: - secureBoot: false clock: timer: hpet: @@ -30,42 +24,54 @@ spec: tickPolicy: catchup utc: {} cpu: - cores: 1 model: host-passthrough + cores: 1 sockets: 1 threads: 1 devices: + autoattachMemBalloon: false blockMultiQueue: false disks: - - disk: + - name: windows-vm-root-disk-deadbeef + disk: bus: virtio - name: windows-vm-root-disk-deadbeef - dedicatedIOThread: false + bootOrder: 1 + inputs: + - bus: virtio + name: tablet + type: tablet + tpm: {} interfaces: - - masquerade: {} + - name: nic-0 + masquerade: {} model: virtio - name: nic-0 - networkInterfaceMultiqueue: true - tpm: { } + networkInterfaceMultiqueue: true features: acpi: {} apic: {} hyperv: - frequencies: {} ipi: {} - reenlightenment: {} - tlbflush: {} - relaxed: {} - reset: {} - runtime: {} - spinlocks: - spinlocks: 8191 synic: {} synictimer: - direct: {} - vapic: {} + direct: {} + spinlocks: + spinlocks: 8191 + evmcs: + enabled: true + relaxed: {} vpindex: {} + runtime: {} + tlbflush: {} + frequencies: {} + vapic: {} smm: {} + firmware: + bootloader: + efi: + secureBoot: false + ioThreads: + supplementalPoolThreadCount: 8 + ioThreadsPolicy: supplementalPool machine: type: q35 resources: @@ -73,11 +79,13 @@ spec: cpu: 1 memory: 2G limits: - cpu: 1 - memory: 2G + cpu: 2 + memory: 4G + evictionStrategy: LiveMigrate networks: - name: nic-0 pod: {} + terminationGracePeriodSeconds: 180 volumes: - dataVolume: name: windows-vm-root-disk-deadbeef diff --git a/tests/unittest/benchmark_runner/common/template_operations/golden_files/func_ci_windows_vm_ODF_PVC_True/windows_vm.yaml b/tests/unittest/benchmark_runner/common/template_operations/golden_files/func_ci_windows_vm_ODF_PVC_True/windows_vm.yaml index 3a15bfd9..e170e38f 100644 --- a/tests/unittest/benchmark_runner/common/template_operations/golden_files/func_ci_windows_vm_ODF_PVC_True/windows_vm.yaml +++ b/tests/unittest/benchmark_runner/common/template_operations/golden_files/func_ci_windows_vm_ODF_PVC_True/windows_vm.yaml @@ -1,7 +1,7 @@ apiVersion: kubevirt.io/v1 kind: VirtualMachine metadata: - name: windows-vm-deadbeef + name: windows-vm-deadbeef labels: kubevirt.io/vm: windows-vm-deadbeef namespace: benchmark-runner @@ -12,13 +12,7 @@ spec: labels: kubevirt.io/vm: windows-vm-deadbeef spec: - terminationGracePeriodSeconds: 0 - evictionStrategy: LiveMigrate domain: - firmware: - bootloader: - efi: - secureBoot: false clock: timer: hpet: @@ -30,42 +24,54 @@ spec: tickPolicy: catchup utc: {} cpu: - cores: 1 model: host-passthrough + cores: 1 sockets: 1 threads: 1 devices: + autoattachMemBalloon: false blockMultiQueue: false disks: - - disk: + - name: windows-vm-root-disk-deadbeef + disk: bus: virtio - name: windows-vm-root-disk-deadbeef - dedicatedIOThread: false + bootOrder: 1 + inputs: + - bus: virtio + name: tablet + type: tablet + tpm: {} interfaces: - - masquerade: {} + - name: nic-0 + masquerade: {} model: virtio - name: nic-0 - networkInterfaceMultiqueue: true - tpm: { } + networkInterfaceMultiqueue: true features: acpi: {} apic: {} hyperv: - frequencies: {} ipi: {} - reenlightenment: {} - tlbflush: {} - relaxed: {} - reset: {} - runtime: {} - spinlocks: - spinlocks: 8191 synic: {} synictimer: - direct: {} - vapic: {} + direct: {} + spinlocks: + spinlocks: 8191 + evmcs: + enabled: true + relaxed: {} vpindex: {} + runtime: {} + tlbflush: {} + frequencies: {} + vapic: {} smm: {} + firmware: + bootloader: + efi: + secureBoot: false + ioThreads: + supplementalPoolThreadCount: 8 + ioThreadsPolicy: supplementalPool machine: type: q35 resources: @@ -73,11 +79,13 @@ spec: cpu: 1 memory: 2G limits: - cpu: 1 - memory: 2G + cpu: 2 + memory: 4G + evictionStrategy: LiveMigrate networks: - name: nic-0 pod: {} + terminationGracePeriodSeconds: 180 volumes: - dataVolume: name: windows-vm-root-disk-deadbeef diff --git a/tests/unittest/benchmark_runner/common/template_operations/golden_files/func_ci_winfio_vm_ODF_PVC_False/winfio_vm.yaml b/tests/unittest/benchmark_runner/common/template_operations/golden_files/func_ci_winfio_vm_ODF_PVC_False/winfio_vm.yaml index f6803b7a..34463ef5 100644 --- a/tests/unittest/benchmark_runner/common/template_operations/golden_files/func_ci_winfio_vm_ODF_PVC_False/winfio_vm.yaml +++ b/tests/unittest/benchmark_runner/common/template_operations/golden_files/func_ci_winfio_vm_ODF_PVC_False/winfio_vm.yaml @@ -12,13 +12,7 @@ spec: labels: kubevirt.io/vm: winfio-vm-deadbeef spec: - terminationGracePeriodSeconds: 0 - evictionStrategy: LiveMigrate domain: - firmware: - bootloader: - efi: - secureBoot: false clock: timer: hpet: @@ -35,52 +29,66 @@ spec: sockets: 2 threads: 1 devices: + autoattachMemBalloon: false blockMultiQueue: false disks: - - disk: + - name: winfio-vm-root-disk-deadbeef + disk: bus: virtio - name: winfio-vm-root-disk-deadbeef - dedicatedIOThread: false + bootOrder: 1 - disk: bus: virtio name: winfio-vm-data-disk-deadbeef - disk: bus: virtio name: cloudinitdisk + inputs: + - bus: virtio + name: tablet + type: tablet + tpm: {} interfaces: - - masquerade: {} + - name: nic-0 + masquerade: {} model: virtio - name: nic-0 - networkInterfaceMultiqueue: true - tpm: { } + networkInterfaceMultiqueue: true features: acpi: {} apic: {} hyperv: - frequencies: {} ipi: {} - reenlightenment: {} - tlbflush: {} - relaxed: {} - reset: {} - runtime: {} - spinlocks: - spinlocks: 8191 synic: {} synictimer: - direct: {} - vapic: {} + direct: {} + spinlocks: + spinlocks: 8191 + evmcs: + enabled: true + relaxed: {} vpindex: {} + runtime: {} + tlbflush: {} + frequencies: {} + vapic: {} smm: {} + firmware: + bootloader: + efi: + secureBoot: false + ioThreads: + supplementalPoolThreadCount: 8 + ioThreadsPolicy: supplementalPool machine: type: q35 resources: requests: cpu: 1 memory: 4G + evictionStrategy: LiveMigrate networks: - name: nic-0 pod: {} + terminationGracePeriodSeconds: 180 volumes: - dataVolume: name: winfio-vm-root-disk-deadbeef diff --git a/tests/unittest/benchmark_runner/common/template_operations/golden_files/func_ci_winfio_vm_ODF_PVC_True/winfio_vm.yaml b/tests/unittest/benchmark_runner/common/template_operations/golden_files/func_ci_winfio_vm_ODF_PVC_True/winfio_vm.yaml index f6803b7a..34463ef5 100644 --- a/tests/unittest/benchmark_runner/common/template_operations/golden_files/func_ci_winfio_vm_ODF_PVC_True/winfio_vm.yaml +++ b/tests/unittest/benchmark_runner/common/template_operations/golden_files/func_ci_winfio_vm_ODF_PVC_True/winfio_vm.yaml @@ -12,13 +12,7 @@ spec: labels: kubevirt.io/vm: winfio-vm-deadbeef spec: - terminationGracePeriodSeconds: 0 - evictionStrategy: LiveMigrate domain: - firmware: - bootloader: - efi: - secureBoot: false clock: timer: hpet: @@ -35,52 +29,66 @@ spec: sockets: 2 threads: 1 devices: + autoattachMemBalloon: false blockMultiQueue: false disks: - - disk: + - name: winfio-vm-root-disk-deadbeef + disk: bus: virtio - name: winfio-vm-root-disk-deadbeef - dedicatedIOThread: false + bootOrder: 1 - disk: bus: virtio name: winfio-vm-data-disk-deadbeef - disk: bus: virtio name: cloudinitdisk + inputs: + - bus: virtio + name: tablet + type: tablet + tpm: {} interfaces: - - masquerade: {} + - name: nic-0 + masquerade: {} model: virtio - name: nic-0 - networkInterfaceMultiqueue: true - tpm: { } + networkInterfaceMultiqueue: true features: acpi: {} apic: {} hyperv: - frequencies: {} ipi: {} - reenlightenment: {} - tlbflush: {} - relaxed: {} - reset: {} - runtime: {} - spinlocks: - spinlocks: 8191 synic: {} synictimer: - direct: {} - vapic: {} + direct: {} + spinlocks: + spinlocks: 8191 + evmcs: + enabled: true + relaxed: {} vpindex: {} + runtime: {} + tlbflush: {} + frequencies: {} + vapic: {} smm: {} + firmware: + bootloader: + efi: + secureBoot: false + ioThreads: + supplementalPoolThreadCount: 8 + ioThreadsPolicy: supplementalPool machine: type: q35 resources: requests: cpu: 1 memory: 4G + evictionStrategy: LiveMigrate networks: - name: nic-0 pod: {} + terminationGracePeriodSeconds: 180 volumes: - dataVolume: name: winfio-vm-root-disk-deadbeef diff --git a/tests/unittest/benchmark_runner/common/template_operations/golden_files/func_ci_winmssql_vm_ODF_PVC_False/winmssql_vm.yaml b/tests/unittest/benchmark_runner/common/template_operations/golden_files/func_ci_winmssql_vm_ODF_PVC_False/winmssql_vm.yaml index 8b97e020..bd9f953b 100644 --- a/tests/unittest/benchmark_runner/common/template_operations/golden_files/func_ci_winmssql_vm_ODF_PVC_False/winmssql_vm.yaml +++ b/tests/unittest/benchmark_runner/common/template_operations/golden_files/func_ci_winmssql_vm_ODF_PVC_False/winmssql_vm.yaml @@ -12,13 +12,7 @@ spec: labels: kubevirt.io/vm: windows-vm-deadbeef spec: - terminationGracePeriodSeconds: 0 - evictionStrategy: LiveMigrate domain: - firmware: - bootloader: - efi: - secureBoot: false clock: timer: hpet: @@ -35,52 +29,66 @@ spec: sockets: 16 threads: 1 devices: + autoattachMemBalloon: false blockMultiQueue: false disks: - - disk: + - name: windows-vm-root-disk-deadbeef + disk: bus: virtio - name: windows-vm-root-disk-deadbeef - dedicatedIOThread: false + bootOrder: 1 - disk: bus: virtio name: windows-vm-data-disk-deadbeef - disk: bus: virtio name: cloudinitdisk + inputs: + - bus: virtio + name: tablet + type: tablet + tpm: {} interfaces: - - masquerade: {} + - name: nic-0 + masquerade: {} model: virtio - name: nic-0 - networkInterfaceMultiqueue: true - tpm: { } + networkInterfaceMultiqueue: true features: acpi: {} apic: {} hyperv: - frequencies: {} ipi: {} - reenlightenment: {} - tlbflush: {} - relaxed: {} - reset: {} - runtime: {} - spinlocks: - spinlocks: 8191 synic: {} synictimer: - direct: {} - vapic: {} + direct: {} + spinlocks: + spinlocks: 8191 + evmcs: + enabled: true + relaxed: {} vpindex: {} + runtime: {} + tlbflush: {} + frequencies: {} + vapic: {} smm: {} + firmware: + bootloader: + efi: + secureBoot: false + ioThreads: + supplementalPoolThreadCount: 8 + ioThreadsPolicy: supplementalPool machine: type: q35 resources: requests: cpu: 16 memory: 16G + evictionStrategy: LiveMigrate networks: - name: nic-0 pod: {} + terminationGracePeriodSeconds: 180 volumes: - dataVolume: name: windows-vm-root-disk-deadbeef diff --git a/tests/unittest/benchmark_runner/common/template_operations/golden_files/func_ci_winmssql_vm_ODF_PVC_True/winmssql_vm.yaml b/tests/unittest/benchmark_runner/common/template_operations/golden_files/func_ci_winmssql_vm_ODF_PVC_True/winmssql_vm.yaml index 8b97e020..bd9f953b 100644 --- a/tests/unittest/benchmark_runner/common/template_operations/golden_files/func_ci_winmssql_vm_ODF_PVC_True/winmssql_vm.yaml +++ b/tests/unittest/benchmark_runner/common/template_operations/golden_files/func_ci_winmssql_vm_ODF_PVC_True/winmssql_vm.yaml @@ -12,13 +12,7 @@ spec: labels: kubevirt.io/vm: windows-vm-deadbeef spec: - terminationGracePeriodSeconds: 0 - evictionStrategy: LiveMigrate domain: - firmware: - bootloader: - efi: - secureBoot: false clock: timer: hpet: @@ -35,52 +29,66 @@ spec: sockets: 16 threads: 1 devices: + autoattachMemBalloon: false blockMultiQueue: false disks: - - disk: + - name: windows-vm-root-disk-deadbeef + disk: bus: virtio - name: windows-vm-root-disk-deadbeef - dedicatedIOThread: false + bootOrder: 1 - disk: bus: virtio name: windows-vm-data-disk-deadbeef - disk: bus: virtio name: cloudinitdisk + inputs: + - bus: virtio + name: tablet + type: tablet + tpm: {} interfaces: - - masquerade: {} + - name: nic-0 + masquerade: {} model: virtio - name: nic-0 - networkInterfaceMultiqueue: true - tpm: { } + networkInterfaceMultiqueue: true features: acpi: {} apic: {} hyperv: - frequencies: {} ipi: {} - reenlightenment: {} - tlbflush: {} - relaxed: {} - reset: {} - runtime: {} - spinlocks: - spinlocks: 8191 synic: {} synictimer: - direct: {} - vapic: {} + direct: {} + spinlocks: + spinlocks: 8191 + evmcs: + enabled: true + relaxed: {} vpindex: {} + runtime: {} + tlbflush: {} + frequencies: {} + vapic: {} smm: {} + firmware: + bootloader: + efi: + secureBoot: false + ioThreads: + supplementalPoolThreadCount: 8 + ioThreadsPolicy: supplementalPool machine: type: q35 resources: requests: cpu: 16 memory: 16G + evictionStrategy: LiveMigrate networks: - name: nic-0 pod: {} + terminationGracePeriodSeconds: 180 volumes: - dataVolume: name: windows-vm-root-disk-deadbeef diff --git a/tests/unittest/benchmark_runner/common/template_operations/golden_files/perf_ci_windows_vm_ODF_PVC_False/windows_vm.yaml b/tests/unittest/benchmark_runner/common/template_operations/golden_files/perf_ci_windows_vm_ODF_PVC_False/windows_vm.yaml index 3a15bfd9..e170e38f 100644 --- a/tests/unittest/benchmark_runner/common/template_operations/golden_files/perf_ci_windows_vm_ODF_PVC_False/windows_vm.yaml +++ b/tests/unittest/benchmark_runner/common/template_operations/golden_files/perf_ci_windows_vm_ODF_PVC_False/windows_vm.yaml @@ -1,7 +1,7 @@ apiVersion: kubevirt.io/v1 kind: VirtualMachine metadata: - name: windows-vm-deadbeef + name: windows-vm-deadbeef labels: kubevirt.io/vm: windows-vm-deadbeef namespace: benchmark-runner @@ -12,13 +12,7 @@ spec: labels: kubevirt.io/vm: windows-vm-deadbeef spec: - terminationGracePeriodSeconds: 0 - evictionStrategy: LiveMigrate domain: - firmware: - bootloader: - efi: - secureBoot: false clock: timer: hpet: @@ -30,42 +24,54 @@ spec: tickPolicy: catchup utc: {} cpu: - cores: 1 model: host-passthrough + cores: 1 sockets: 1 threads: 1 devices: + autoattachMemBalloon: false blockMultiQueue: false disks: - - disk: + - name: windows-vm-root-disk-deadbeef + disk: bus: virtio - name: windows-vm-root-disk-deadbeef - dedicatedIOThread: false + bootOrder: 1 + inputs: + - bus: virtio + name: tablet + type: tablet + tpm: {} interfaces: - - masquerade: {} + - name: nic-0 + masquerade: {} model: virtio - name: nic-0 - networkInterfaceMultiqueue: true - tpm: { } + networkInterfaceMultiqueue: true features: acpi: {} apic: {} hyperv: - frequencies: {} ipi: {} - reenlightenment: {} - tlbflush: {} - relaxed: {} - reset: {} - runtime: {} - spinlocks: - spinlocks: 8191 synic: {} synictimer: - direct: {} - vapic: {} + direct: {} + spinlocks: + spinlocks: 8191 + evmcs: + enabled: true + relaxed: {} vpindex: {} + runtime: {} + tlbflush: {} + frequencies: {} + vapic: {} smm: {} + firmware: + bootloader: + efi: + secureBoot: false + ioThreads: + supplementalPoolThreadCount: 8 + ioThreadsPolicy: supplementalPool machine: type: q35 resources: @@ -73,11 +79,13 @@ spec: cpu: 1 memory: 2G limits: - cpu: 1 - memory: 2G + cpu: 2 + memory: 4G + evictionStrategy: LiveMigrate networks: - name: nic-0 pod: {} + terminationGracePeriodSeconds: 180 volumes: - dataVolume: name: windows-vm-root-disk-deadbeef diff --git a/tests/unittest/benchmark_runner/common/template_operations/golden_files/perf_ci_windows_vm_ODF_PVC_True/windows_vm.yaml b/tests/unittest/benchmark_runner/common/template_operations/golden_files/perf_ci_windows_vm_ODF_PVC_True/windows_vm.yaml index 3a15bfd9..e170e38f 100644 --- a/tests/unittest/benchmark_runner/common/template_operations/golden_files/perf_ci_windows_vm_ODF_PVC_True/windows_vm.yaml +++ b/tests/unittest/benchmark_runner/common/template_operations/golden_files/perf_ci_windows_vm_ODF_PVC_True/windows_vm.yaml @@ -1,7 +1,7 @@ apiVersion: kubevirt.io/v1 kind: VirtualMachine metadata: - name: windows-vm-deadbeef + name: windows-vm-deadbeef labels: kubevirt.io/vm: windows-vm-deadbeef namespace: benchmark-runner @@ -12,13 +12,7 @@ spec: labels: kubevirt.io/vm: windows-vm-deadbeef spec: - terminationGracePeriodSeconds: 0 - evictionStrategy: LiveMigrate domain: - firmware: - bootloader: - efi: - secureBoot: false clock: timer: hpet: @@ -30,42 +24,54 @@ spec: tickPolicy: catchup utc: {} cpu: - cores: 1 model: host-passthrough + cores: 1 sockets: 1 threads: 1 devices: + autoattachMemBalloon: false blockMultiQueue: false disks: - - disk: + - name: windows-vm-root-disk-deadbeef + disk: bus: virtio - name: windows-vm-root-disk-deadbeef - dedicatedIOThread: false + bootOrder: 1 + inputs: + - bus: virtio + name: tablet + type: tablet + tpm: {} interfaces: - - masquerade: {} + - name: nic-0 + masquerade: {} model: virtio - name: nic-0 - networkInterfaceMultiqueue: true - tpm: { } + networkInterfaceMultiqueue: true features: acpi: {} apic: {} hyperv: - frequencies: {} ipi: {} - reenlightenment: {} - tlbflush: {} - relaxed: {} - reset: {} - runtime: {} - spinlocks: - spinlocks: 8191 synic: {} synictimer: - direct: {} - vapic: {} + direct: {} + spinlocks: + spinlocks: 8191 + evmcs: + enabled: true + relaxed: {} vpindex: {} + runtime: {} + tlbflush: {} + frequencies: {} + vapic: {} smm: {} + firmware: + bootloader: + efi: + secureBoot: false + ioThreads: + supplementalPoolThreadCount: 8 + ioThreadsPolicy: supplementalPool machine: type: q35 resources: @@ -73,11 +79,13 @@ spec: cpu: 1 memory: 2G limits: - cpu: 1 - memory: 2G + cpu: 2 + memory: 4G + evictionStrategy: LiveMigrate networks: - name: nic-0 pod: {} + terminationGracePeriodSeconds: 180 volumes: - dataVolume: name: windows-vm-root-disk-deadbeef diff --git a/tests/unittest/benchmark_runner/common/template_operations/golden_files/perf_ci_winfio_vm_ODF_PVC_False/winfio_vm.yaml b/tests/unittest/benchmark_runner/common/template_operations/golden_files/perf_ci_winfio_vm_ODF_PVC_False/winfio_vm.yaml index f6803b7a..34463ef5 100644 --- a/tests/unittest/benchmark_runner/common/template_operations/golden_files/perf_ci_winfio_vm_ODF_PVC_False/winfio_vm.yaml +++ b/tests/unittest/benchmark_runner/common/template_operations/golden_files/perf_ci_winfio_vm_ODF_PVC_False/winfio_vm.yaml @@ -12,13 +12,7 @@ spec: labels: kubevirt.io/vm: winfio-vm-deadbeef spec: - terminationGracePeriodSeconds: 0 - evictionStrategy: LiveMigrate domain: - firmware: - bootloader: - efi: - secureBoot: false clock: timer: hpet: @@ -35,52 +29,66 @@ spec: sockets: 2 threads: 1 devices: + autoattachMemBalloon: false blockMultiQueue: false disks: - - disk: + - name: winfio-vm-root-disk-deadbeef + disk: bus: virtio - name: winfio-vm-root-disk-deadbeef - dedicatedIOThread: false + bootOrder: 1 - disk: bus: virtio name: winfio-vm-data-disk-deadbeef - disk: bus: virtio name: cloudinitdisk + inputs: + - bus: virtio + name: tablet + type: tablet + tpm: {} interfaces: - - masquerade: {} + - name: nic-0 + masquerade: {} model: virtio - name: nic-0 - networkInterfaceMultiqueue: true - tpm: { } + networkInterfaceMultiqueue: true features: acpi: {} apic: {} hyperv: - frequencies: {} ipi: {} - reenlightenment: {} - tlbflush: {} - relaxed: {} - reset: {} - runtime: {} - spinlocks: - spinlocks: 8191 synic: {} synictimer: - direct: {} - vapic: {} + direct: {} + spinlocks: + spinlocks: 8191 + evmcs: + enabled: true + relaxed: {} vpindex: {} + runtime: {} + tlbflush: {} + frequencies: {} + vapic: {} smm: {} + firmware: + bootloader: + efi: + secureBoot: false + ioThreads: + supplementalPoolThreadCount: 8 + ioThreadsPolicy: supplementalPool machine: type: q35 resources: requests: cpu: 1 memory: 4G + evictionStrategy: LiveMigrate networks: - name: nic-0 pod: {} + terminationGracePeriodSeconds: 180 volumes: - dataVolume: name: winfio-vm-root-disk-deadbeef diff --git a/tests/unittest/benchmark_runner/common/template_operations/golden_files/perf_ci_winfio_vm_ODF_PVC_True/winfio_vm.yaml b/tests/unittest/benchmark_runner/common/template_operations/golden_files/perf_ci_winfio_vm_ODF_PVC_True/winfio_vm.yaml index f6803b7a..34463ef5 100644 --- a/tests/unittest/benchmark_runner/common/template_operations/golden_files/perf_ci_winfio_vm_ODF_PVC_True/winfio_vm.yaml +++ b/tests/unittest/benchmark_runner/common/template_operations/golden_files/perf_ci_winfio_vm_ODF_PVC_True/winfio_vm.yaml @@ -12,13 +12,7 @@ spec: labels: kubevirt.io/vm: winfio-vm-deadbeef spec: - terminationGracePeriodSeconds: 0 - evictionStrategy: LiveMigrate domain: - firmware: - bootloader: - efi: - secureBoot: false clock: timer: hpet: @@ -35,52 +29,66 @@ spec: sockets: 2 threads: 1 devices: + autoattachMemBalloon: false blockMultiQueue: false disks: - - disk: + - name: winfio-vm-root-disk-deadbeef + disk: bus: virtio - name: winfio-vm-root-disk-deadbeef - dedicatedIOThread: false + bootOrder: 1 - disk: bus: virtio name: winfio-vm-data-disk-deadbeef - disk: bus: virtio name: cloudinitdisk + inputs: + - bus: virtio + name: tablet + type: tablet + tpm: {} interfaces: - - masquerade: {} + - name: nic-0 + masquerade: {} model: virtio - name: nic-0 - networkInterfaceMultiqueue: true - tpm: { } + networkInterfaceMultiqueue: true features: acpi: {} apic: {} hyperv: - frequencies: {} ipi: {} - reenlightenment: {} - tlbflush: {} - relaxed: {} - reset: {} - runtime: {} - spinlocks: - spinlocks: 8191 synic: {} synictimer: - direct: {} - vapic: {} + direct: {} + spinlocks: + spinlocks: 8191 + evmcs: + enabled: true + relaxed: {} vpindex: {} + runtime: {} + tlbflush: {} + frequencies: {} + vapic: {} smm: {} + firmware: + bootloader: + efi: + secureBoot: false + ioThreads: + supplementalPoolThreadCount: 8 + ioThreadsPolicy: supplementalPool machine: type: q35 resources: requests: cpu: 1 memory: 4G + evictionStrategy: LiveMigrate networks: - name: nic-0 pod: {} + terminationGracePeriodSeconds: 180 volumes: - dataVolume: name: winfio-vm-root-disk-deadbeef diff --git a/tests/unittest/benchmark_runner/common/template_operations/golden_files/perf_ci_winmssql_vm_ODF_PVC_False/winmssql_vm.yaml b/tests/unittest/benchmark_runner/common/template_operations/golden_files/perf_ci_winmssql_vm_ODF_PVC_False/winmssql_vm.yaml index 71b1a295..51a9277b 100644 --- a/tests/unittest/benchmark_runner/common/template_operations/golden_files/perf_ci_winmssql_vm_ODF_PVC_False/winmssql_vm.yaml +++ b/tests/unittest/benchmark_runner/common/template_operations/golden_files/perf_ci_winmssql_vm_ODF_PVC_False/winmssql_vm.yaml @@ -12,13 +12,7 @@ spec: labels: kubevirt.io/vm: windows-vm-deadbeef spec: - terminationGracePeriodSeconds: 0 - evictionStrategy: LiveMigrate domain: - firmware: - bootloader: - efi: - secureBoot: false clock: timer: hpet: @@ -35,52 +29,66 @@ spec: sockets: 32 threads: 1 devices: + autoattachMemBalloon: false blockMultiQueue: false disks: - - disk: + - name: windows-vm-root-disk-deadbeef + disk: bus: virtio - name: windows-vm-root-disk-deadbeef - dedicatedIOThread: false + bootOrder: 1 - disk: bus: virtio name: windows-vm-data-disk-deadbeef - disk: bus: virtio name: cloudinitdisk + inputs: + - bus: virtio + name: tablet + type: tablet + tpm: {} interfaces: - - masquerade: {} + - name: nic-0 + masquerade: {} model: virtio - name: nic-0 - networkInterfaceMultiqueue: true - tpm: { } + networkInterfaceMultiqueue: true features: acpi: {} apic: {} hyperv: - frequencies: {} ipi: {} - reenlightenment: {} - tlbflush: {} - relaxed: {} - reset: {} - runtime: {} - spinlocks: - spinlocks: 8191 synic: {} synictimer: - direct: {} - vapic: {} + direct: {} + spinlocks: + spinlocks: 8191 + evmcs: + enabled: true + relaxed: {} vpindex: {} + runtime: {} + tlbflush: {} + frequencies: {} + vapic: {} smm: {} + firmware: + bootloader: + efi: + secureBoot: false + ioThreads: + supplementalPoolThreadCount: 8 + ioThreadsPolicy: supplementalPool machine: type: q35 resources: requests: cpu: 32 memory: 32G + evictionStrategy: LiveMigrate networks: - name: nic-0 pod: {} + terminationGracePeriodSeconds: 180 volumes: - dataVolume: name: windows-vm-root-disk-deadbeef diff --git a/tests/unittest/benchmark_runner/common/template_operations/golden_files/perf_ci_winmssql_vm_ODF_PVC_True/winmssql_vm.yaml b/tests/unittest/benchmark_runner/common/template_operations/golden_files/perf_ci_winmssql_vm_ODF_PVC_True/winmssql_vm.yaml index 71b1a295..51a9277b 100644 --- a/tests/unittest/benchmark_runner/common/template_operations/golden_files/perf_ci_winmssql_vm_ODF_PVC_True/winmssql_vm.yaml +++ b/tests/unittest/benchmark_runner/common/template_operations/golden_files/perf_ci_winmssql_vm_ODF_PVC_True/winmssql_vm.yaml @@ -12,13 +12,7 @@ spec: labels: kubevirt.io/vm: windows-vm-deadbeef spec: - terminationGracePeriodSeconds: 0 - evictionStrategy: LiveMigrate domain: - firmware: - bootloader: - efi: - secureBoot: false clock: timer: hpet: @@ -35,52 +29,66 @@ spec: sockets: 32 threads: 1 devices: + autoattachMemBalloon: false blockMultiQueue: false disks: - - disk: + - name: windows-vm-root-disk-deadbeef + disk: bus: virtio - name: windows-vm-root-disk-deadbeef - dedicatedIOThread: false + bootOrder: 1 - disk: bus: virtio name: windows-vm-data-disk-deadbeef - disk: bus: virtio name: cloudinitdisk + inputs: + - bus: virtio + name: tablet + type: tablet + tpm: {} interfaces: - - masquerade: {} + - name: nic-0 + masquerade: {} model: virtio - name: nic-0 - networkInterfaceMultiqueue: true - tpm: { } + networkInterfaceMultiqueue: true features: acpi: {} apic: {} hyperv: - frequencies: {} ipi: {} - reenlightenment: {} - tlbflush: {} - relaxed: {} - reset: {} - runtime: {} - spinlocks: - spinlocks: 8191 synic: {} synictimer: - direct: {} - vapic: {} + direct: {} + spinlocks: + spinlocks: 8191 + evmcs: + enabled: true + relaxed: {} vpindex: {} + runtime: {} + tlbflush: {} + frequencies: {} + vapic: {} smm: {} + firmware: + bootloader: + efi: + secureBoot: false + ioThreads: + supplementalPoolThreadCount: 8 + ioThreadsPolicy: supplementalPool machine: type: q35 resources: requests: cpu: 32 memory: 32G + evictionStrategy: LiveMigrate networks: - name: nic-0 pod: {} + terminationGracePeriodSeconds: 180 volumes: - dataVolume: name: windows-vm-root-disk-deadbeef diff --git a/tests/unittest/benchmark_runner/common/template_operations/golden_files/release_windows_vm_ODF_PVC_False/windows_vm.yaml b/tests/unittest/benchmark_runner/common/template_operations/golden_files/release_windows_vm_ODF_PVC_False/windows_vm.yaml index 3a15bfd9..e170e38f 100644 --- a/tests/unittest/benchmark_runner/common/template_operations/golden_files/release_windows_vm_ODF_PVC_False/windows_vm.yaml +++ b/tests/unittest/benchmark_runner/common/template_operations/golden_files/release_windows_vm_ODF_PVC_False/windows_vm.yaml @@ -1,7 +1,7 @@ apiVersion: kubevirt.io/v1 kind: VirtualMachine metadata: - name: windows-vm-deadbeef + name: windows-vm-deadbeef labels: kubevirt.io/vm: windows-vm-deadbeef namespace: benchmark-runner @@ -12,13 +12,7 @@ spec: labels: kubevirt.io/vm: windows-vm-deadbeef spec: - terminationGracePeriodSeconds: 0 - evictionStrategy: LiveMigrate domain: - firmware: - bootloader: - efi: - secureBoot: false clock: timer: hpet: @@ -30,42 +24,54 @@ spec: tickPolicy: catchup utc: {} cpu: - cores: 1 model: host-passthrough + cores: 1 sockets: 1 threads: 1 devices: + autoattachMemBalloon: false blockMultiQueue: false disks: - - disk: + - name: windows-vm-root-disk-deadbeef + disk: bus: virtio - name: windows-vm-root-disk-deadbeef - dedicatedIOThread: false + bootOrder: 1 + inputs: + - bus: virtio + name: tablet + type: tablet + tpm: {} interfaces: - - masquerade: {} + - name: nic-0 + masquerade: {} model: virtio - name: nic-0 - networkInterfaceMultiqueue: true - tpm: { } + networkInterfaceMultiqueue: true features: acpi: {} apic: {} hyperv: - frequencies: {} ipi: {} - reenlightenment: {} - tlbflush: {} - relaxed: {} - reset: {} - runtime: {} - spinlocks: - spinlocks: 8191 synic: {} synictimer: - direct: {} - vapic: {} + direct: {} + spinlocks: + spinlocks: 8191 + evmcs: + enabled: true + relaxed: {} vpindex: {} + runtime: {} + tlbflush: {} + frequencies: {} + vapic: {} smm: {} + firmware: + bootloader: + efi: + secureBoot: false + ioThreads: + supplementalPoolThreadCount: 8 + ioThreadsPolicy: supplementalPool machine: type: q35 resources: @@ -73,11 +79,13 @@ spec: cpu: 1 memory: 2G limits: - cpu: 1 - memory: 2G + cpu: 2 + memory: 4G + evictionStrategy: LiveMigrate networks: - name: nic-0 pod: {} + terminationGracePeriodSeconds: 180 volumes: - dataVolume: name: windows-vm-root-disk-deadbeef diff --git a/tests/unittest/benchmark_runner/common/template_operations/golden_files/release_windows_vm_ODF_PVC_True/windows_vm.yaml b/tests/unittest/benchmark_runner/common/template_operations/golden_files/release_windows_vm_ODF_PVC_True/windows_vm.yaml index 3a15bfd9..e170e38f 100644 --- a/tests/unittest/benchmark_runner/common/template_operations/golden_files/release_windows_vm_ODF_PVC_True/windows_vm.yaml +++ b/tests/unittest/benchmark_runner/common/template_operations/golden_files/release_windows_vm_ODF_PVC_True/windows_vm.yaml @@ -1,7 +1,7 @@ apiVersion: kubevirt.io/v1 kind: VirtualMachine metadata: - name: windows-vm-deadbeef + name: windows-vm-deadbeef labels: kubevirt.io/vm: windows-vm-deadbeef namespace: benchmark-runner @@ -12,13 +12,7 @@ spec: labels: kubevirt.io/vm: windows-vm-deadbeef spec: - terminationGracePeriodSeconds: 0 - evictionStrategy: LiveMigrate domain: - firmware: - bootloader: - efi: - secureBoot: false clock: timer: hpet: @@ -30,42 +24,54 @@ spec: tickPolicy: catchup utc: {} cpu: - cores: 1 model: host-passthrough + cores: 1 sockets: 1 threads: 1 devices: + autoattachMemBalloon: false blockMultiQueue: false disks: - - disk: + - name: windows-vm-root-disk-deadbeef + disk: bus: virtio - name: windows-vm-root-disk-deadbeef - dedicatedIOThread: false + bootOrder: 1 + inputs: + - bus: virtio + name: tablet + type: tablet + tpm: {} interfaces: - - masquerade: {} + - name: nic-0 + masquerade: {} model: virtio - name: nic-0 - networkInterfaceMultiqueue: true - tpm: { } + networkInterfaceMultiqueue: true features: acpi: {} apic: {} hyperv: - frequencies: {} ipi: {} - reenlightenment: {} - tlbflush: {} - relaxed: {} - reset: {} - runtime: {} - spinlocks: - spinlocks: 8191 synic: {} synictimer: - direct: {} - vapic: {} + direct: {} + spinlocks: + spinlocks: 8191 + evmcs: + enabled: true + relaxed: {} vpindex: {} + runtime: {} + tlbflush: {} + frequencies: {} + vapic: {} smm: {} + firmware: + bootloader: + efi: + secureBoot: false + ioThreads: + supplementalPoolThreadCount: 8 + ioThreadsPolicy: supplementalPool machine: type: q35 resources: @@ -73,11 +79,13 @@ spec: cpu: 1 memory: 2G limits: - cpu: 1 - memory: 2G + cpu: 2 + memory: 4G + evictionStrategy: LiveMigrate networks: - name: nic-0 pod: {} + terminationGracePeriodSeconds: 180 volumes: - dataVolume: name: windows-vm-root-disk-deadbeef diff --git a/tests/unittest/benchmark_runner/common/template_operations/golden_files/release_winfio_vm_ODF_PVC_False/winfio_vm.yaml b/tests/unittest/benchmark_runner/common/template_operations/golden_files/release_winfio_vm_ODF_PVC_False/winfio_vm.yaml index f6803b7a..34463ef5 100644 --- a/tests/unittest/benchmark_runner/common/template_operations/golden_files/release_winfio_vm_ODF_PVC_False/winfio_vm.yaml +++ b/tests/unittest/benchmark_runner/common/template_operations/golden_files/release_winfio_vm_ODF_PVC_False/winfio_vm.yaml @@ -12,13 +12,7 @@ spec: labels: kubevirt.io/vm: winfio-vm-deadbeef spec: - terminationGracePeriodSeconds: 0 - evictionStrategy: LiveMigrate domain: - firmware: - bootloader: - efi: - secureBoot: false clock: timer: hpet: @@ -35,52 +29,66 @@ spec: sockets: 2 threads: 1 devices: + autoattachMemBalloon: false blockMultiQueue: false disks: - - disk: + - name: winfio-vm-root-disk-deadbeef + disk: bus: virtio - name: winfio-vm-root-disk-deadbeef - dedicatedIOThread: false + bootOrder: 1 - disk: bus: virtio name: winfio-vm-data-disk-deadbeef - disk: bus: virtio name: cloudinitdisk + inputs: + - bus: virtio + name: tablet + type: tablet + tpm: {} interfaces: - - masquerade: {} + - name: nic-0 + masquerade: {} model: virtio - name: nic-0 - networkInterfaceMultiqueue: true - tpm: { } + networkInterfaceMultiqueue: true features: acpi: {} apic: {} hyperv: - frequencies: {} ipi: {} - reenlightenment: {} - tlbflush: {} - relaxed: {} - reset: {} - runtime: {} - spinlocks: - spinlocks: 8191 synic: {} synictimer: - direct: {} - vapic: {} + direct: {} + spinlocks: + spinlocks: 8191 + evmcs: + enabled: true + relaxed: {} vpindex: {} + runtime: {} + tlbflush: {} + frequencies: {} + vapic: {} smm: {} + firmware: + bootloader: + efi: + secureBoot: false + ioThreads: + supplementalPoolThreadCount: 8 + ioThreadsPolicy: supplementalPool machine: type: q35 resources: requests: cpu: 1 memory: 4G + evictionStrategy: LiveMigrate networks: - name: nic-0 pod: {} + terminationGracePeriodSeconds: 180 volumes: - dataVolume: name: winfio-vm-root-disk-deadbeef diff --git a/tests/unittest/benchmark_runner/common/template_operations/golden_files/release_winfio_vm_ODF_PVC_True/winfio_vm.yaml b/tests/unittest/benchmark_runner/common/template_operations/golden_files/release_winfio_vm_ODF_PVC_True/winfio_vm.yaml index f6803b7a..34463ef5 100644 --- a/tests/unittest/benchmark_runner/common/template_operations/golden_files/release_winfio_vm_ODF_PVC_True/winfio_vm.yaml +++ b/tests/unittest/benchmark_runner/common/template_operations/golden_files/release_winfio_vm_ODF_PVC_True/winfio_vm.yaml @@ -12,13 +12,7 @@ spec: labels: kubevirt.io/vm: winfio-vm-deadbeef spec: - terminationGracePeriodSeconds: 0 - evictionStrategy: LiveMigrate domain: - firmware: - bootloader: - efi: - secureBoot: false clock: timer: hpet: @@ -35,52 +29,66 @@ spec: sockets: 2 threads: 1 devices: + autoattachMemBalloon: false blockMultiQueue: false disks: - - disk: + - name: winfio-vm-root-disk-deadbeef + disk: bus: virtio - name: winfio-vm-root-disk-deadbeef - dedicatedIOThread: false + bootOrder: 1 - disk: bus: virtio name: winfio-vm-data-disk-deadbeef - disk: bus: virtio name: cloudinitdisk + inputs: + - bus: virtio + name: tablet + type: tablet + tpm: {} interfaces: - - masquerade: {} + - name: nic-0 + masquerade: {} model: virtio - name: nic-0 - networkInterfaceMultiqueue: true - tpm: { } + networkInterfaceMultiqueue: true features: acpi: {} apic: {} hyperv: - frequencies: {} ipi: {} - reenlightenment: {} - tlbflush: {} - relaxed: {} - reset: {} - runtime: {} - spinlocks: - spinlocks: 8191 synic: {} synictimer: - direct: {} - vapic: {} + direct: {} + spinlocks: + spinlocks: 8191 + evmcs: + enabled: true + relaxed: {} vpindex: {} + runtime: {} + tlbflush: {} + frequencies: {} + vapic: {} smm: {} + firmware: + bootloader: + efi: + secureBoot: false + ioThreads: + supplementalPoolThreadCount: 8 + ioThreadsPolicy: supplementalPool machine: type: q35 resources: requests: cpu: 1 memory: 4G + evictionStrategy: LiveMigrate networks: - name: nic-0 pod: {} + terminationGracePeriodSeconds: 180 volumes: - dataVolume: name: winfio-vm-root-disk-deadbeef diff --git a/tests/unittest/benchmark_runner/common/template_operations/golden_files/release_winmssql_vm_ODF_PVC_False/winmssql_vm.yaml b/tests/unittest/benchmark_runner/common/template_operations/golden_files/release_winmssql_vm_ODF_PVC_False/winmssql_vm.yaml index 8b97e020..bd9f953b 100644 --- a/tests/unittest/benchmark_runner/common/template_operations/golden_files/release_winmssql_vm_ODF_PVC_False/winmssql_vm.yaml +++ b/tests/unittest/benchmark_runner/common/template_operations/golden_files/release_winmssql_vm_ODF_PVC_False/winmssql_vm.yaml @@ -12,13 +12,7 @@ spec: labels: kubevirt.io/vm: windows-vm-deadbeef spec: - terminationGracePeriodSeconds: 0 - evictionStrategy: LiveMigrate domain: - firmware: - bootloader: - efi: - secureBoot: false clock: timer: hpet: @@ -35,52 +29,66 @@ spec: sockets: 16 threads: 1 devices: + autoattachMemBalloon: false blockMultiQueue: false disks: - - disk: + - name: windows-vm-root-disk-deadbeef + disk: bus: virtio - name: windows-vm-root-disk-deadbeef - dedicatedIOThread: false + bootOrder: 1 - disk: bus: virtio name: windows-vm-data-disk-deadbeef - disk: bus: virtio name: cloudinitdisk + inputs: + - bus: virtio + name: tablet + type: tablet + tpm: {} interfaces: - - masquerade: {} + - name: nic-0 + masquerade: {} model: virtio - name: nic-0 - networkInterfaceMultiqueue: true - tpm: { } + networkInterfaceMultiqueue: true features: acpi: {} apic: {} hyperv: - frequencies: {} ipi: {} - reenlightenment: {} - tlbflush: {} - relaxed: {} - reset: {} - runtime: {} - spinlocks: - spinlocks: 8191 synic: {} synictimer: - direct: {} - vapic: {} + direct: {} + spinlocks: + spinlocks: 8191 + evmcs: + enabled: true + relaxed: {} vpindex: {} + runtime: {} + tlbflush: {} + frequencies: {} + vapic: {} smm: {} + firmware: + bootloader: + efi: + secureBoot: false + ioThreads: + supplementalPoolThreadCount: 8 + ioThreadsPolicy: supplementalPool machine: type: q35 resources: requests: cpu: 16 memory: 16G + evictionStrategy: LiveMigrate networks: - name: nic-0 pod: {} + terminationGracePeriodSeconds: 180 volumes: - dataVolume: name: windows-vm-root-disk-deadbeef diff --git a/tests/unittest/benchmark_runner/common/template_operations/golden_files/release_winmssql_vm_ODF_PVC_True/winmssql_vm.yaml b/tests/unittest/benchmark_runner/common/template_operations/golden_files/release_winmssql_vm_ODF_PVC_True/winmssql_vm.yaml index 8b97e020..bd9f953b 100644 --- a/tests/unittest/benchmark_runner/common/template_operations/golden_files/release_winmssql_vm_ODF_PVC_True/winmssql_vm.yaml +++ b/tests/unittest/benchmark_runner/common/template_operations/golden_files/release_winmssql_vm_ODF_PVC_True/winmssql_vm.yaml @@ -12,13 +12,7 @@ spec: labels: kubevirt.io/vm: windows-vm-deadbeef spec: - terminationGracePeriodSeconds: 0 - evictionStrategy: LiveMigrate domain: - firmware: - bootloader: - efi: - secureBoot: false clock: timer: hpet: @@ -35,52 +29,66 @@ spec: sockets: 16 threads: 1 devices: + autoattachMemBalloon: false blockMultiQueue: false disks: - - disk: + - name: windows-vm-root-disk-deadbeef + disk: bus: virtio - name: windows-vm-root-disk-deadbeef - dedicatedIOThread: false + bootOrder: 1 - disk: bus: virtio name: windows-vm-data-disk-deadbeef - disk: bus: virtio name: cloudinitdisk + inputs: + - bus: virtio + name: tablet + type: tablet + tpm: {} interfaces: - - masquerade: {} + - name: nic-0 + masquerade: {} model: virtio - name: nic-0 - networkInterfaceMultiqueue: true - tpm: { } + networkInterfaceMultiqueue: true features: acpi: {} apic: {} hyperv: - frequencies: {} ipi: {} - reenlightenment: {} - tlbflush: {} - relaxed: {} - reset: {} - runtime: {} - spinlocks: - spinlocks: 8191 synic: {} synictimer: - direct: {} - vapic: {} + direct: {} + spinlocks: + spinlocks: 8191 + evmcs: + enabled: true + relaxed: {} vpindex: {} + runtime: {} + tlbflush: {} + frequencies: {} + vapic: {} smm: {} + firmware: + bootloader: + efi: + secureBoot: false + ioThreads: + supplementalPoolThreadCount: 8 + ioThreadsPolicy: supplementalPool machine: type: q35 resources: requests: cpu: 16 memory: 16G + evictionStrategy: LiveMigrate networks: - name: nic-0 pod: {} + terminationGracePeriodSeconds: 180 volumes: - dataVolume: name: windows-vm-root-disk-deadbeef diff --git a/tests/unittest/benchmark_runner/common/template_operations/golden_files/test_ci_windows_vm_ODF_PVC_False/windows_vm.yaml b/tests/unittest/benchmark_runner/common/template_operations/golden_files/test_ci_windows_vm_ODF_PVC_False/windows_vm.yaml index 3a15bfd9..e170e38f 100644 --- a/tests/unittest/benchmark_runner/common/template_operations/golden_files/test_ci_windows_vm_ODF_PVC_False/windows_vm.yaml +++ b/tests/unittest/benchmark_runner/common/template_operations/golden_files/test_ci_windows_vm_ODF_PVC_False/windows_vm.yaml @@ -1,7 +1,7 @@ apiVersion: kubevirt.io/v1 kind: VirtualMachine metadata: - name: windows-vm-deadbeef + name: windows-vm-deadbeef labels: kubevirt.io/vm: windows-vm-deadbeef namespace: benchmark-runner @@ -12,13 +12,7 @@ spec: labels: kubevirt.io/vm: windows-vm-deadbeef spec: - terminationGracePeriodSeconds: 0 - evictionStrategy: LiveMigrate domain: - firmware: - bootloader: - efi: - secureBoot: false clock: timer: hpet: @@ -30,42 +24,54 @@ spec: tickPolicy: catchup utc: {} cpu: - cores: 1 model: host-passthrough + cores: 1 sockets: 1 threads: 1 devices: + autoattachMemBalloon: false blockMultiQueue: false disks: - - disk: + - name: windows-vm-root-disk-deadbeef + disk: bus: virtio - name: windows-vm-root-disk-deadbeef - dedicatedIOThread: false + bootOrder: 1 + inputs: + - bus: virtio + name: tablet + type: tablet + tpm: {} interfaces: - - masquerade: {} + - name: nic-0 + masquerade: {} model: virtio - name: nic-0 - networkInterfaceMultiqueue: true - tpm: { } + networkInterfaceMultiqueue: true features: acpi: {} apic: {} hyperv: - frequencies: {} ipi: {} - reenlightenment: {} - tlbflush: {} - relaxed: {} - reset: {} - runtime: {} - spinlocks: - spinlocks: 8191 synic: {} synictimer: - direct: {} - vapic: {} + direct: {} + spinlocks: + spinlocks: 8191 + evmcs: + enabled: true + relaxed: {} vpindex: {} + runtime: {} + tlbflush: {} + frequencies: {} + vapic: {} smm: {} + firmware: + bootloader: + efi: + secureBoot: false + ioThreads: + supplementalPoolThreadCount: 8 + ioThreadsPolicy: supplementalPool machine: type: q35 resources: @@ -73,11 +79,13 @@ spec: cpu: 1 memory: 2G limits: - cpu: 1 - memory: 2G + cpu: 2 + memory: 4G + evictionStrategy: LiveMigrate networks: - name: nic-0 pod: {} + terminationGracePeriodSeconds: 180 volumes: - dataVolume: name: windows-vm-root-disk-deadbeef diff --git a/tests/unittest/benchmark_runner/common/template_operations/golden_files/test_ci_windows_vm_ODF_PVC_True/windows_vm.yaml b/tests/unittest/benchmark_runner/common/template_operations/golden_files/test_ci_windows_vm_ODF_PVC_True/windows_vm.yaml index 3a15bfd9..e170e38f 100644 --- a/tests/unittest/benchmark_runner/common/template_operations/golden_files/test_ci_windows_vm_ODF_PVC_True/windows_vm.yaml +++ b/tests/unittest/benchmark_runner/common/template_operations/golden_files/test_ci_windows_vm_ODF_PVC_True/windows_vm.yaml @@ -1,7 +1,7 @@ apiVersion: kubevirt.io/v1 kind: VirtualMachine metadata: - name: windows-vm-deadbeef + name: windows-vm-deadbeef labels: kubevirt.io/vm: windows-vm-deadbeef namespace: benchmark-runner @@ -12,13 +12,7 @@ spec: labels: kubevirt.io/vm: windows-vm-deadbeef spec: - terminationGracePeriodSeconds: 0 - evictionStrategy: LiveMigrate domain: - firmware: - bootloader: - efi: - secureBoot: false clock: timer: hpet: @@ -30,42 +24,54 @@ spec: tickPolicy: catchup utc: {} cpu: - cores: 1 model: host-passthrough + cores: 1 sockets: 1 threads: 1 devices: + autoattachMemBalloon: false blockMultiQueue: false disks: - - disk: + - name: windows-vm-root-disk-deadbeef + disk: bus: virtio - name: windows-vm-root-disk-deadbeef - dedicatedIOThread: false + bootOrder: 1 + inputs: + - bus: virtio + name: tablet + type: tablet + tpm: {} interfaces: - - masquerade: {} + - name: nic-0 + masquerade: {} model: virtio - name: nic-0 - networkInterfaceMultiqueue: true - tpm: { } + networkInterfaceMultiqueue: true features: acpi: {} apic: {} hyperv: - frequencies: {} ipi: {} - reenlightenment: {} - tlbflush: {} - relaxed: {} - reset: {} - runtime: {} - spinlocks: - spinlocks: 8191 synic: {} synictimer: - direct: {} - vapic: {} + direct: {} + spinlocks: + spinlocks: 8191 + evmcs: + enabled: true + relaxed: {} vpindex: {} + runtime: {} + tlbflush: {} + frequencies: {} + vapic: {} smm: {} + firmware: + bootloader: + efi: + secureBoot: false + ioThreads: + supplementalPoolThreadCount: 8 + ioThreadsPolicy: supplementalPool machine: type: q35 resources: @@ -73,11 +79,13 @@ spec: cpu: 1 memory: 2G limits: - cpu: 1 - memory: 2G + cpu: 2 + memory: 4G + evictionStrategy: LiveMigrate networks: - name: nic-0 pod: {} + terminationGracePeriodSeconds: 180 volumes: - dataVolume: name: windows-vm-root-disk-deadbeef diff --git a/tests/unittest/benchmark_runner/common/template_operations/golden_files/test_ci_winfio_vm_ODF_PVC_False/winfio_vm.yaml b/tests/unittest/benchmark_runner/common/template_operations/golden_files/test_ci_winfio_vm_ODF_PVC_False/winfio_vm.yaml index f6803b7a..34463ef5 100644 --- a/tests/unittest/benchmark_runner/common/template_operations/golden_files/test_ci_winfio_vm_ODF_PVC_False/winfio_vm.yaml +++ b/tests/unittest/benchmark_runner/common/template_operations/golden_files/test_ci_winfio_vm_ODF_PVC_False/winfio_vm.yaml @@ -12,13 +12,7 @@ spec: labels: kubevirt.io/vm: winfio-vm-deadbeef spec: - terminationGracePeriodSeconds: 0 - evictionStrategy: LiveMigrate domain: - firmware: - bootloader: - efi: - secureBoot: false clock: timer: hpet: @@ -35,52 +29,66 @@ spec: sockets: 2 threads: 1 devices: + autoattachMemBalloon: false blockMultiQueue: false disks: - - disk: + - name: winfio-vm-root-disk-deadbeef + disk: bus: virtio - name: winfio-vm-root-disk-deadbeef - dedicatedIOThread: false + bootOrder: 1 - disk: bus: virtio name: winfio-vm-data-disk-deadbeef - disk: bus: virtio name: cloudinitdisk + inputs: + - bus: virtio + name: tablet + type: tablet + tpm: {} interfaces: - - masquerade: {} + - name: nic-0 + masquerade: {} model: virtio - name: nic-0 - networkInterfaceMultiqueue: true - tpm: { } + networkInterfaceMultiqueue: true features: acpi: {} apic: {} hyperv: - frequencies: {} ipi: {} - reenlightenment: {} - tlbflush: {} - relaxed: {} - reset: {} - runtime: {} - spinlocks: - spinlocks: 8191 synic: {} synictimer: - direct: {} - vapic: {} + direct: {} + spinlocks: + spinlocks: 8191 + evmcs: + enabled: true + relaxed: {} vpindex: {} + runtime: {} + tlbflush: {} + frequencies: {} + vapic: {} smm: {} + firmware: + bootloader: + efi: + secureBoot: false + ioThreads: + supplementalPoolThreadCount: 8 + ioThreadsPolicy: supplementalPool machine: type: q35 resources: requests: cpu: 1 memory: 4G + evictionStrategy: LiveMigrate networks: - name: nic-0 pod: {} + terminationGracePeriodSeconds: 180 volumes: - dataVolume: name: winfio-vm-root-disk-deadbeef diff --git a/tests/unittest/benchmark_runner/common/template_operations/golden_files/test_ci_winfio_vm_ODF_PVC_True/winfio_vm.yaml b/tests/unittest/benchmark_runner/common/template_operations/golden_files/test_ci_winfio_vm_ODF_PVC_True/winfio_vm.yaml index f6803b7a..34463ef5 100644 --- a/tests/unittest/benchmark_runner/common/template_operations/golden_files/test_ci_winfio_vm_ODF_PVC_True/winfio_vm.yaml +++ b/tests/unittest/benchmark_runner/common/template_operations/golden_files/test_ci_winfio_vm_ODF_PVC_True/winfio_vm.yaml @@ -12,13 +12,7 @@ spec: labels: kubevirt.io/vm: winfio-vm-deadbeef spec: - terminationGracePeriodSeconds: 0 - evictionStrategy: LiveMigrate domain: - firmware: - bootloader: - efi: - secureBoot: false clock: timer: hpet: @@ -35,52 +29,66 @@ spec: sockets: 2 threads: 1 devices: + autoattachMemBalloon: false blockMultiQueue: false disks: - - disk: + - name: winfio-vm-root-disk-deadbeef + disk: bus: virtio - name: winfio-vm-root-disk-deadbeef - dedicatedIOThread: false + bootOrder: 1 - disk: bus: virtio name: winfio-vm-data-disk-deadbeef - disk: bus: virtio name: cloudinitdisk + inputs: + - bus: virtio + name: tablet + type: tablet + tpm: {} interfaces: - - masquerade: {} + - name: nic-0 + masquerade: {} model: virtio - name: nic-0 - networkInterfaceMultiqueue: true - tpm: { } + networkInterfaceMultiqueue: true features: acpi: {} apic: {} hyperv: - frequencies: {} ipi: {} - reenlightenment: {} - tlbflush: {} - relaxed: {} - reset: {} - runtime: {} - spinlocks: - spinlocks: 8191 synic: {} synictimer: - direct: {} - vapic: {} + direct: {} + spinlocks: + spinlocks: 8191 + evmcs: + enabled: true + relaxed: {} vpindex: {} + runtime: {} + tlbflush: {} + frequencies: {} + vapic: {} smm: {} + firmware: + bootloader: + efi: + secureBoot: false + ioThreads: + supplementalPoolThreadCount: 8 + ioThreadsPolicy: supplementalPool machine: type: q35 resources: requests: cpu: 1 memory: 4G + evictionStrategy: LiveMigrate networks: - name: nic-0 pod: {} + terminationGracePeriodSeconds: 180 volumes: - dataVolume: name: winfio-vm-root-disk-deadbeef diff --git a/tests/unittest/benchmark_runner/common/template_operations/golden_files/test_ci_winmssql_vm_ODF_PVC_False/winmssql_vm.yaml b/tests/unittest/benchmark_runner/common/template_operations/golden_files/test_ci_winmssql_vm_ODF_PVC_False/winmssql_vm.yaml index 8b97e020..bd9f953b 100644 --- a/tests/unittest/benchmark_runner/common/template_operations/golden_files/test_ci_winmssql_vm_ODF_PVC_False/winmssql_vm.yaml +++ b/tests/unittest/benchmark_runner/common/template_operations/golden_files/test_ci_winmssql_vm_ODF_PVC_False/winmssql_vm.yaml @@ -12,13 +12,7 @@ spec: labels: kubevirt.io/vm: windows-vm-deadbeef spec: - terminationGracePeriodSeconds: 0 - evictionStrategy: LiveMigrate domain: - firmware: - bootloader: - efi: - secureBoot: false clock: timer: hpet: @@ -35,52 +29,66 @@ spec: sockets: 16 threads: 1 devices: + autoattachMemBalloon: false blockMultiQueue: false disks: - - disk: + - name: windows-vm-root-disk-deadbeef + disk: bus: virtio - name: windows-vm-root-disk-deadbeef - dedicatedIOThread: false + bootOrder: 1 - disk: bus: virtio name: windows-vm-data-disk-deadbeef - disk: bus: virtio name: cloudinitdisk + inputs: + - bus: virtio + name: tablet + type: tablet + tpm: {} interfaces: - - masquerade: {} + - name: nic-0 + masquerade: {} model: virtio - name: nic-0 - networkInterfaceMultiqueue: true - tpm: { } + networkInterfaceMultiqueue: true features: acpi: {} apic: {} hyperv: - frequencies: {} ipi: {} - reenlightenment: {} - tlbflush: {} - relaxed: {} - reset: {} - runtime: {} - spinlocks: - spinlocks: 8191 synic: {} synictimer: - direct: {} - vapic: {} + direct: {} + spinlocks: + spinlocks: 8191 + evmcs: + enabled: true + relaxed: {} vpindex: {} + runtime: {} + tlbflush: {} + frequencies: {} + vapic: {} smm: {} + firmware: + bootloader: + efi: + secureBoot: false + ioThreads: + supplementalPoolThreadCount: 8 + ioThreadsPolicy: supplementalPool machine: type: q35 resources: requests: cpu: 16 memory: 16G + evictionStrategy: LiveMigrate networks: - name: nic-0 pod: {} + terminationGracePeriodSeconds: 180 volumes: - dataVolume: name: windows-vm-root-disk-deadbeef diff --git a/tests/unittest/benchmark_runner/common/template_operations/golden_files/test_ci_winmssql_vm_ODF_PVC_True/winmssql_vm.yaml b/tests/unittest/benchmark_runner/common/template_operations/golden_files/test_ci_winmssql_vm_ODF_PVC_True/winmssql_vm.yaml index 8b97e020..bd9f953b 100644 --- a/tests/unittest/benchmark_runner/common/template_operations/golden_files/test_ci_winmssql_vm_ODF_PVC_True/winmssql_vm.yaml +++ b/tests/unittest/benchmark_runner/common/template_operations/golden_files/test_ci_winmssql_vm_ODF_PVC_True/winmssql_vm.yaml @@ -12,13 +12,7 @@ spec: labels: kubevirt.io/vm: windows-vm-deadbeef spec: - terminationGracePeriodSeconds: 0 - evictionStrategy: LiveMigrate domain: - firmware: - bootloader: - efi: - secureBoot: false clock: timer: hpet: @@ -35,52 +29,66 @@ spec: sockets: 16 threads: 1 devices: + autoattachMemBalloon: false blockMultiQueue: false disks: - - disk: + - name: windows-vm-root-disk-deadbeef + disk: bus: virtio - name: windows-vm-root-disk-deadbeef - dedicatedIOThread: false + bootOrder: 1 - disk: bus: virtio name: windows-vm-data-disk-deadbeef - disk: bus: virtio name: cloudinitdisk + inputs: + - bus: virtio + name: tablet + type: tablet + tpm: {} interfaces: - - masquerade: {} + - name: nic-0 + masquerade: {} model: virtio - name: nic-0 - networkInterfaceMultiqueue: true - tpm: { } + networkInterfaceMultiqueue: true features: acpi: {} apic: {} hyperv: - frequencies: {} ipi: {} - reenlightenment: {} - tlbflush: {} - relaxed: {} - reset: {} - runtime: {} - spinlocks: - spinlocks: 8191 synic: {} synictimer: - direct: {} - vapic: {} + direct: {} + spinlocks: + spinlocks: 8191 + evmcs: + enabled: true + relaxed: {} vpindex: {} + runtime: {} + tlbflush: {} + frequencies: {} + vapic: {} smm: {} + firmware: + bootloader: + efi: + secureBoot: false + ioThreads: + supplementalPoolThreadCount: 8 + ioThreadsPolicy: supplementalPool machine: type: q35 resources: requests: cpu: 16 memory: 16G + evictionStrategy: LiveMigrate networks: - name: nic-0 pod: {} + terminationGracePeriodSeconds: 180 volumes: - dataVolume: name: windows-vm-root-disk-deadbeef