From d8b195c3e72e8d4ebf8d3d8831aadbda9fea5e32 Mon Sep 17 00:00:00 2001
From: Myasnikov Daniil <myasnikovdaniil2001@gmail.com>
Date: Wed, 15 Apr 2026 10:23:00 +0500
Subject: [PATCH 1/3] [tests] Add BATS E2E coverage for vm-disk source.disk and
 source.image
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Follow-up to PR #2258: adds two new @test cases in hack/e2e-apps/vm-disk.bats
covering the new vm-disk clone paths — source.image (golden image from
cozy-public) and source.disk (PVC clone within tenant namespace). Existing
source.http coverage in vminstance.bats is not touched.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Signed-off-by: Myasnikov Daniil <myasnikovdaniil2001@gmail.com>
---
 hack/e2e-apps/vm-disk.bats | 81 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 81 insertions(+)
 create mode 100644 hack/e2e-apps/vm-disk.bats

diff --git a/hack/e2e-apps/vm-disk.bats b/hack/e2e-apps/vm-disk.bats
new file mode 100644
index 00000000..00ec8fb2
--- /dev/null
+++ b/hack/e2e-apps/vm-disk.bats
@@ -0,0 +1,81 @@
+#!/usr/bin/env bats
+
+# Tests for vm-disk source types: source.image and source.disk.
+# Existing source.http coverage lives in vminstance.bats.
+
+@test "Create a VM Disk from source.image (golden image clone)" {
+  name='test-image-src'
+  kubectl -n tenant-test delete vmdisks.apps.cozystack.io $name --ignore-not-found --timeout=2m || true
+  kubectl apply -f - <<EOF
+apiVersion: apps.cozystack.io/v1alpha1
+kind: VMDisk
+metadata:
+  name: $name
+  namespace: tenant-test
+spec:
+  source:
+    image:
+      name: alpine-3.21
+  optical: false
+  storage: 5Gi
+  storageClass: replicated
+EOF
+  sleep 5
+  kubectl -n tenant-test wait hr vm-disk-$name --timeout=5s --for=condition=ready
+  kubectl -n tenant-test wait dv vm-disk-$name --timeout=250s --for=condition=ready
+  kubectl -n tenant-test wait pvc vm-disk-$name --timeout=200s --for=jsonpath='{.status.phase}'=Bound
+  kubectl -n tenant-test delete vmdisks.apps.cozystack.io $name
+}
+
+@test "Create a VM Disk from source.disk (PVC clone)" {
+  base='test-disk-base'
+  clone='test-disk-clone'
+
+  # Ensure both resources are absent before starting
+  kubectl -n tenant-test delete vmdisks.apps.cozystack.io $clone --ignore-not-found --timeout=2m || true
+  kubectl -n tenant-test delete vmdisks.apps.cozystack.io $base --ignore-not-found --timeout=2m || true
+
+  # Create the base disk via source.http (fast URL re-used from vminstance.bats)
+  kubectl apply -f - <<EOF
+apiVersion: apps.cozystack.io/v1alpha1
+kind: VMDisk
+metadata:
+  name: $base
+  namespace: tenant-test
+spec:
+  source:
+    http:
+      url: https://cloud-images.ubuntu.com/noble/current/noble-server-cloudimg-amd64.img
+  optical: false
+  storage: 5Gi
+  storageClass: replicated
+EOF
+  sleep 5
+  kubectl -n tenant-test wait hr vm-disk-$base --timeout=5s --for=condition=ready
+  kubectl -n tenant-test wait dv vm-disk-$base --timeout=250s --for=condition=ready
+  kubectl -n tenant-test wait pvc vm-disk-$base --timeout=200s --for=jsonpath='{.status.phase}'=Bound
+
+  # Now clone the base disk using source.disk
+  kubectl apply -f - <<EOF
+apiVersion: apps.cozystack.io/v1alpha1
+kind: VMDisk
+metadata:
+  name: $clone
+  namespace: tenant-test
+spec:
+  source:
+    disk:
+      name: $base
+  optical: false
+  storage: 5Gi
+  storageClass: replicated
+EOF
+  sleep 5
+  kubectl -n tenant-test wait hr vm-disk-$clone --timeout=5s --for=condition=ready
+  kubectl -n tenant-test wait dv vm-disk-$clone --timeout=250s --for=condition=ready
+  kubectl -n tenant-test wait pvc vm-disk-$clone --timeout=200s --for=jsonpath='{.status.phase}'=Bound
+
+  # Cleanup both
+  kubectl -n tenant-test delete vmdisks.apps.cozystack.io $clone
+  kubectl -n tenant-test delete vmdisks.apps.cozystack.io $base
+}

From f7c7044602099137b8d938714b06add765a3eb07 Mon Sep 17 00:00:00 2001
From: Myasnikov Daniil <myasnikovdaniil2001@gmail.com>
Date: Wed, 15 Apr 2026 10:37:41 +0500
Subject: [PATCH 2/3] [tests] Use Alpine for source.disk base instead of Ubuntu
 noble

The clone step is what this test exercises, not the HTTP import. Ubuntu
noble is ~600MB; Alpine is ~50MB, which cuts CI time without losing
coverage.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Signed-off-by: Myasnikov Daniil <myasnikovdaniil2001@gmail.com>
---
 hack/e2e-apps/vm-disk.bats | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/hack/e2e-apps/vm-disk.bats b/hack/e2e-apps/vm-disk.bats
index 00ec8fb2..185e2764 100644
--- a/hack/e2e-apps/vm-disk.bats
+++ b/hack/e2e-apps/vm-disk.bats
@@ -35,7 +35,8 @@ EOF
   kubectl -n tenant-test delete vmdisks.apps.cozystack.io $clone --ignore-not-found --timeout=2m || true
   kubectl -n tenant-test delete vmdisks.apps.cozystack.io $base --ignore-not-found --timeout=2m || true
 
-  # Create the base disk via source.http (fast URL re-used from vminstance.bats)
+  # Create the base disk via source.http. Alpine is ~50MB vs Ubuntu noble's ~600MB,
+  # which keeps this test fast; the assertion here is the clone step, not the HTTP import.
   kubectl apply -f - <<EOF
 apiVersion: apps.cozystack.io/v1alpha1
 kind: VMDisk
@@ -45,7 +46,7 @@ metadata:
 spec:
   source:
     http:
-      url: https://cloud-images.ubuntu.com/noble/current/noble-server-cloudimg-amd64.img
+      url: https://dl-cdn.alpinelinux.org/alpine/v3.21/releases/cloud/nocloud_alpine-3.21.6-x86_64-bios-cloudinit-r0.qcow2
   optical: false
   storage: 5Gi
   storageClass: replicated

From 25537cadd6bf9f3c2106f25f6f31df0282164d0a Mon Sep 17 00:00:00 2001
From: Myasnikov Daniil <myasnikovdaniil2001@gmail.com>
Date: Thu, 16 Apr 2026 13:24:42 +0500
Subject: [PATCH 3/3] [tests] Address review feedback for vm-disk E2E tests

- Add teardown() function for reliable cleanup after each test
- Increase HelmRelease wait timeout from 5s to 30s
- Switch base disk in source.disk test from source.http to source.image
- Remove inline cleanup in favor of teardown

Assisted-By: Claude <noreply@anthropic.com>
Signed-off-by: Myasnikov Daniil <myasnikovdaniil2001@gmail.com>
---
 hack/e2e-apps/vm-disk.bats | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/hack/e2e-apps/vm-disk.bats b/hack/e2e-apps/vm-disk.bats
index 185e2764..cf1a1f90 100644
--- a/hack/e2e-apps/vm-disk.bats
+++ b/hack/e2e-apps/vm-disk.bats
@@ -3,6 +3,10 @@
 # Tests for vm-disk source types: source.image and source.disk.
 # Existing source.http coverage lives in vminstance.bats.
 
+teardown() {
+  kubectl -n tenant-test delete vmdisks.apps.cozystack.io test-image-src test-disk-clone test-disk-base --ignore-not-found --timeout=2m || true
+}
+
 @test "Create a VM Disk from source.image (golden image clone)" {
   name='test-image-src'
   kubectl -n tenant-test delete vmdisks.apps.cozystack.io $name --ignore-not-found --timeout=2m || true
@@ -21,10 +25,9 @@ spec:
   storageClass: replicated
 EOF
   sleep 5
-  kubectl -n tenant-test wait hr vm-disk-$name --timeout=5s --for=condition=ready
+  kubectl -n tenant-test wait hr vm-disk-$name --timeout=30s --for=condition=ready
   kubectl -n tenant-test wait dv vm-disk-$name --timeout=250s --for=condition=ready
   kubectl -n tenant-test wait pvc vm-disk-$name --timeout=200s --for=jsonpath='{.status.phase}'=Bound
-  kubectl -n tenant-test delete vmdisks.apps.cozystack.io $name
 }
 
 @test "Create a VM Disk from source.disk (PVC clone)" {
@@ -35,8 +38,8 @@ EOF
   kubectl -n tenant-test delete vmdisks.apps.cozystack.io $clone --ignore-not-found --timeout=2m || true
   kubectl -n tenant-test delete vmdisks.apps.cozystack.io $base --ignore-not-found --timeout=2m || true
 
-  # Create the base disk via source.http. Alpine is ~50MB vs Ubuntu noble's ~600MB,
-  # which keeps this test fast; the assertion here is the clone step, not the HTTP import.
+  # Create the base disk from a golden image. The assertion here is the clone
+  # step (source.disk), not the base provisioning method.
   kubectl apply -f - <<EOF
 apiVersion: apps.cozystack.io/v1alpha1
 kind: VMDisk
@@ -45,14 +48,14 @@ metadata:
   namespace: tenant-test
 spec:
   source:
-    http:
-      url: https://dl-cdn.alpinelinux.org/alpine/v3.21/releases/cloud/nocloud_alpine-3.21.6-x86_64-bios-cloudinit-r0.qcow2
+    image:
+      name: alpine-3.21
   optical: false
   storage: 5Gi
   storageClass: replicated
 EOF
   sleep 5
-  kubectl -n tenant-test wait hr vm-disk-$base --timeout=5s --for=condition=ready
+  kubectl -n tenant-test wait hr vm-disk-$base --timeout=30s --for=condition=ready
   kubectl -n tenant-test wait dv vm-disk-$base --timeout=250s --for=condition=ready
   kubectl -n tenant-test wait pvc vm-disk-$base --timeout=200s --for=jsonpath='{.status.phase}'=Bound
 
@@ -72,11 +75,7 @@ spec:
   storageClass: replicated
 EOF
   sleep 5
-  kubectl -n tenant-test wait hr vm-disk-$clone --timeout=5s --for=condition=ready
+  kubectl -n tenant-test wait hr vm-disk-$clone --timeout=30s --for=condition=ready
   kubectl -n tenant-test wait dv vm-disk-$clone --timeout=250s --for=condition=ready
   kubectl -n tenant-test wait pvc vm-disk-$clone --timeout=200s --for=jsonpath='{.status.phase}'=Bound
-
-  # Cleanup both
-  kubectl -n tenant-test delete vmdisks.apps.cozystack.io $clone
-  kubectl -n tenant-test delete vmdisks.apps.cozystack.io $base
 }