Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 14 additions & 3 deletions test/e2e/internal/object/const.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,24 @@ limitations under the License.
package object

const (
ImageURLAlpineUEFIPerf = "https://89d64382-20df-4581-8cc7-80df331f67fa.selstorage.ru/alpine/alpine-3-21-uefi-perf.qcow2"
ImageURLUbuntu = "https://89d64382-20df-4581-8cc7-80df331f67fa.selstorage.ru/ubuntu/ubuntu-24.04-minimal-cloudimg-amd64.qcow2"
ImageURLAlpineBIOS = "https://89d64382-20df-4581-8cc7-80df331f67fa.selstorage.ru/alpine/alpine-3-21-bios-base.qcow2"
ImageURLAlpineUEFIPerf = "https://dl-cdn.alpinelinux.org/alpine/v3.23/releases/cloud/nocloud_alpine-3.23.0-x86_64-uefi-cloudinit-metal-r0.qcow2"
// ImageURLAlpineUEFIPerf = "https://89d64382-20df-4581-8cc7-80df331f67fa.selstorage.ru/alpine/alpine-3-21-uefi-perf.qcow2"
ImageURLUbuntu = "https://89d64382-20df-4581-8cc7-80df331f67fa.selstorage.ru/ubuntu/ubuntu-24.04-minimal-cloudimg-amd64.qcow2"
ImageURLAlpineBIOS = "https://dl-cdn.alpinelinux.org/alpine/v3.23/releases/cloud/nocloud_alpine-3.23.0-x86_64-bios-cloudinit-metal-r0.qcow2"
// ImageURLAlpineBIOS = "https://89d64382-20df-4581-8cc7-80df331f67fa.selstorage.ru/alpine/alpine-3-21-bios-base.qcow2"
ImageURLContainerImage = "cr.yandex/crpvs5j3nh1mi2tpithr/e2e/alpine/alpine-image:latest"
ImageURLMinimalQCOW = "https://89d64382-20df-4581-8cc7-80df331f67fa.selstorage.ru/test/test.qcow2"
ImageURLMinimalISO = "https://89d64382-20df-4581-8cc7-80df331f67fa.selstorage.ru/test/test.iso"
Mi256 = 256 * 1024 * 1024
DefaultVMClass = "generic"
DefaultCloudInit = `#cloud-config
package_update: true
packages:
- qemu-guest-agent
- curl
- bash
- sudo
- iputils
users:
- name: cloud
# passwd: cloud
Expand All @@ -36,6 +45,8 @@ users:
ssh_authorized_keys:
# testcases
- ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFxcXHmwaGnJ8scJaEN5RzklBPZpVSic4GdaAsKjQoeA your_email@example.com
runcmd:
- "rc-update add qemu-guest-agent && rc-service qemu-guest-agent start"
`
DefaultSSHPrivateKey = `-----BEGIN OPENSSH PRIVATE KEY-----
b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- vi-ubuntu-http.yaml
# - vi-ubuntu-http.yaml
- vi-alpine-http.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
apiVersion: virtualization.deckhouse.io/v1alpha2
kind: VirtualImage
metadata:
name: vi-alpine-http
spec:
storage: ContainerRegistry
dataSource:
type: HTTP
http:
url: https://dl-cdn.alpinelinux.org/alpine/v3.23/releases/cloud/generic_alpine-3.23.3-x86_64-uefi-cloudinit-r0.qcow2
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
#cloud-config
package_update: true
packages:
- qemu-guest-agent
- curl
- bash
- sudo
- iputils
users:
- name: cloud
# passwd: cloud
Expand Down Expand Up @@ -42,9 +49,10 @@ write_files:
while true; do
ping -W1 -D 1.1.1.1 >> /tmp/ping.log
done
final_message: "\U0001F525\U0001F525\U0001F525 The system is finally up, after $(awk '{print int($1)}' /proc/uptime) seconds \U0001F525\U0001F525\U0001F525"
final_message: "\U0001F525\U0001F525\U0001F525 The system is finally up, after ${uptime} seconds \U0001F525\U0001F525\U0001F525"
runcmd:
- "echo \"\U0001F7E1 Starting runcmd at $(date +%H:%M:%S)\""
- rc-update add ping-service default
- rc-service ping-service start
- "rc-update add qemu-guest-agent && rc-service qemu-guest-agent start"
- "echo \"\U0001F7E1 Finished runcmd at $(date +%H:%M:%S)\""
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@ metadata:
spec:
persistentVolumeClaim:
storageClassName: "{{ .STORAGE_CLASS_NAME }}"
size: 3700Mi
size: 350Mi
dataSource:
type: ObjectRef
objectRef:
kind: VirtualImage
name: vi-ubuntu-http
name: vi-alpine-http
# name: vi-ubuntu-http
10 changes: 10 additions & 0 deletions test/e2e/legacy/testdata/complex-test/cvi/cvi-alpine-http.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
apiVersion: virtualization.deckhouse.io/v1alpha2
kind: ClusterVirtualImage
metadata:
name: cvi-alpine-http
spec:
dataSource:
type: HTTP
http:
url: https://dl-cdn.alpinelinux.org/alpine/v3.23/releases/cloud/generic_alpine-3.23.3-x86_64-uefi-cloudinit-r0.qcow2
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@
apiVersion: virtualization.deckhouse.io/v1alpha2
kind: ClusterVirtualImage
metadata:
name: cvi-from-cvi-ubu-http
name: cvi-from-cvi-http
# name: cvi-from-cvi-ubu-http
spec:
dataSource:
type: ObjectRef
objectRef:
kind: ClusterVirtualImage
name: cvi-ubuntu-http
name: cvi-alpine-http
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@
apiVersion: virtualization.deckhouse.io/v1alpha2
kind: ClusterVirtualImage
metadata:
name: cvi-from-vi-ubu-http
name: cvi-from-vi-http
# name: cvi-from-vi-ubu-http
spec:
dataSource:
type: ObjectRef
objectRef:
kind: VirtualImage
name: vi-ubuntu-http
name: vi-alpine-http
namespace: testcases
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ spec:
type: HTTP
http:
url: https://89d64382-20df-4581-8cc7-80df331f67fa.selstorage.ru/ubuntu/ubuntu-24.04-minimal-cloudimg-amd64.qcow2
# url: https://dl-cdn.alpinelinux.org/alpine/v3.23/releases/cloud/generic_alpine-3.23.3-x86_64-uefi-cloudinit-r0.qcow2
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- cvi-ubuntu-http.yaml
# - cvi-ubuntu-http.yaml
- cvi-alpine-http.yaml
- cvi-alpine-registry.yaml
- cvi-from-vi-ubuntu-http.yaml
- cvi-from-cvi-ubuntu-http.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- ./vd-ubuntu-http.yaml
- ./vd-alpine-http.yaml
# - ./vd-ubuntu-http.yaml
- ./vd-alpine-registry.yaml
- ./vd-blank.yaml
- ./vd-from-cvi-ubuntu-http.yaml
Expand Down
14 changes: 14 additions & 0 deletions test/e2e/legacy/testdata/complex-test/vd/vd-alpine-http.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
---
apiVersion: virtualization.deckhouse.io/v1alpha2
kind: VirtualDisk
metadata:
name: vd-alpine-http
spec:
dataSource:
type: HTTP
http:
url: https://dl-cdn.alpinelinux.org/alpine/v3.23/releases/cloud/generic_alpine-3.23.3-x86_64-uefi-cloudinit-r0.qcow2
persistentVolumeClaim:
storageClassName: "{{ .STORAGE_CLASS_NAME }}"
# size: 3600Mi
size: 350Mi
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
apiVersion: virtualization.deckhouse.io/v1alpha2
kind: VirtualDisk
metadata:
name: vd-from-cvi-ubuntu-http
name: vd-from-cvi-http
# name: vd-from-cvi-ubuntu-http
spec:
persistentVolumeClaim:
storageClassName: "{{ .STORAGE_CLASS_NAME }}"
Expand All @@ -10,4 +11,5 @@ spec:
type: ObjectRef
objectRef:
kind: ClusterVirtualImage
name: cvi-ubuntu-http
name: cvi-alpine-http
# name: cvi-ubuntu-http
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
apiVersion: virtualization.deckhouse.io/v1alpha2
kind: VirtualDisk
metadata:
name: vd-from-vi-ubuntu-http
name: vd-from-vi-http
spec:
persistentVolumeClaim:
storageClassName: "{{ .STORAGE_CLASS_NAME }}"
size: 3600Mi
# size: 3600Mi
size: 350Mi
dataSource:
type: ObjectRef
objectRef:
kind: VirtualImage
name: vi-ubuntu-http
name: vi-alpine-http
# name: vi-ubuntu-http
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- vi-ubuntu-http.yaml
# - vi-ubuntu-http.yaml
- vi-alpine-http.yaml
- vi-alpine-registry.yaml
- vi-from-cvi-ubuntu-http.yaml
- vi-from-vi-ubuntu-http.yaml
11 changes: 11 additions & 0 deletions test/e2e/legacy/testdata/complex-test/vi/vi-alpine-http.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
apiVersion: virtualization.deckhouse.io/v1alpha2
kind: VirtualImage
metadata:
name: vi-alpine-http
spec:
storage: ContainerRegistry
dataSource:
type: HTTP
http:
url: https://dl-cdn.alpinelinux.org/alpine/v3.23/releases/cloud/generic_alpine-3.23.3-x86_64-uefi-cloudinit-r0.qcow2
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@
apiVersion: virtualization.deckhouse.io/v1alpha2
kind: VirtualImage
metadata:
name: vi-from-cvi-ubuntu-http
name: vi-from-cvi-http
spec:
storage: ContainerRegistry
dataSource:
type: ObjectRef
objectRef:
kind: ClusterVirtualImage
name: cvi-ubuntu-http
name: cvi-alpine-http
# name: cvi-ubuntu-http
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@ spec:
type: ObjectRef
objectRef:
kind: VirtualImage
name: vi-ubuntu-http
name: vi-alpine-http
# name: vi-ubuntu-http
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
#cloud-config
package_update: true
packages:
- qemu-guest-agent
- curl
- bash
- sudo
- iputils
users:
- name: cloud
# passwd: cloud
Expand All @@ -9,4 +16,8 @@ users:
ssh_authorized_keys:
# testcases
- ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFxcXHmwaGnJ8scJaEN5RzklBPZpVSic4GdaAsKjQoeA your_email@example.com
final_message: "\U0001F525\U0001F525\U0001F525 The system is finally up, after $(awk '{print int($1)}' /proc/uptime) seconds \U0001F525\U0001F525\U0001F525"
final_message: "\U0001F525\U0001F525\U0001F525 The system is finally up, after ${updame} \U0001F525\U0001F525\U0001F525"
runcmd:
- "echo \"\U0001F7E1 Starting runcmd at $(date +%H:%M:%S)\""
- "rc-update add qemu-guest-agent && rc-service qemu-guest-agent start"
- "echo \"\U0001F7E1 Finished runcmd at $(date +%H:%M:%S)\""
6 changes: 4 additions & 2 deletions test/e2e/legacy/testdata/complex-test/vm/base/vd-root.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@ metadata:
spec:
persistentVolumeClaim:
storageClassName: "{{ .STORAGE_CLASS_NAME }}"
size: 3600Mi
size: 350Mi
# size: 3600Mi
dataSource:
type: ObjectRef
objectRef:
kind: VirtualImage
name: vi-ubuntu-http
name: vi-alpine-http
# name: vi-ubuntu-http
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,13 @@ patches:
path: /spec/provisioning/userData
value: |
#cloud-config
package_update: true
packages:
- qemu-guest-agent
- curl
- bash
- sudo
- iputils
users:
- name: cloud
# passwd: cloud
Expand All @@ -33,6 +40,8 @@ patches:
ssh_authorized_keys:
# testcases
- ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFxcXHmwaGnJ8scJaEN5RzklBPZpVSic4GdaAsKjQoeA your_email@example.com
runcmd:
- "rc-update add qemu-guest-agent && rc-service qemu-guest-agent start"
target:
kind: VirtualMachine
name: vm
Expand Down
Loading