Split the device target tests

Signed-off-by: Itxaka <itxaka@kairos.io>

tests/install_target_test.go

@@ -0,0 +1,113 @@
+package mos_test
+
+import (
+	"fmt"
+	. "github.com/spectrocloud/peg/matcher"
+	"os"
+
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
+)
+
+var _ = Describe("kairos install test different targets", Label("install-test-target"), func() {
+
+	var vm VM
+	BeforeEach(func() {
+
+		_, vm = startVM()
+		vm.EventuallyConnects(1200)
+		// Format the disk so it gets an uuid and label
+		_, err := vm.Sudo("mkfs.ext4 -L TESTDISK /dev/vda")
+		Expect(err).NotTo(HaveOccurred())
+	})
+
+	AfterEach(func() {
+		Expect(vm.Destroy(nil)).ToNot(HaveOccurred())
+	})
+
+	Context("Selects the disk by uuid/label", func() {
+		It("Selects the correct disk if using uuid for target", func() {
+			expectSecureBootEnabled(vm)
+			// Get uuid of main disk
+			uuid, err := vm.Sudo("lsblk /dev/vda -o UUID -n")
+
+			cc := fmt.Sprintf(`#cloud-config
+				install:
+				  auto: true
+				  reboot: true
+				  device: /dev/disk/by-uuid/%s
+				
+				stages:
+				  initramfs:
+					- name: "Set user and password"
+					  users:
+						kairos:
+						  passwd: "kairos"
+					  hostname: kairos-{{ trunc 4 .Random }}
+				`, uuid)
+
+			By("Using the following config")
+			fmt.Fprintf(GinkgoWriter, cc)
+
+			t, err := os.CreateTemp("", "test")
+			ExpectWithOffset(1, err).ToNot(HaveOccurred())
+
+			defer os.RemoveAll(t.Name())
+			err = os.WriteFile(t.Name(), []byte(cc), os.ModePerm)
+			Expect(err).ToNot(HaveOccurred())
+
+			err = vm.Scp(t.Name(), "/tmp/config.yaml", "0770")
+			Expect(err).ToNot(HaveOccurred())
+
+			var out string
+			// Test that install works
+			By("installing kairos", func() {
+				out, err = vm.Sudo(`kairos-agent --debug manual-install /tmp/config.yaml`)
+				Expect(err).ToNot(HaveOccurred(), out)
+				Expect(out).Should(ContainSubstring("Running after-install hook"))
+				vm.Sudo("sync")
+			})
+		})
+		It("Selects the correct disk if using label for target", func() {
+			expectSecureBootEnabled(vm)
+			// Get label of main disk
+			label, err := vm.Sudo("lsblk /dev/vda -o LABEL -n")
+
+			cc := fmt.Sprintf(`#cloud-config
+				install:
+				  auto: true
+				  reboot: true
+				  device: /dev/disk/by-label/%s
+				
+				stages:
+				  initramfs:
+					- name: "Set user and password"
+					  users:
+						kairos:
+						  passwd: "kairos"
+					  hostname: kairos-{{ trunc 4 .Random }}
+				`, label)
+
+			By("Using the following config")
+			fmt.Fprintf(GinkgoWriter, cc)
+
+			t, err := os.CreateTemp("", "test")
+			ExpectWithOffset(1, err).ToNot(HaveOccurred())
+
+			defer os.RemoveAll(t.Name())
+			err = os.WriteFile(t.Name(), []byte(cc), os.ModePerm)
+			Expect(err).ToNot(HaveOccurred())
+
+			err = vm.Scp(t.Name(), "/tmp/config.yaml", "0770")
+			Expect(err).ToNot(HaveOccurred())
+
+			var out string
+			By("installing kairos", func() {
+				out, err = vm.Sudo(`kairos-agent --debug manual-install /tmp/config.yaml`)
+				Expect(err).ToNot(HaveOccurred(), out)
+				Expect(out).Should(ContainSubstring("Running after-install hook"))
+				vm.Sudo("sync")
+			})
+		})
+	})
+})

tests/install_test.go

@@ -68,56 +68,6 @@ var _ = Describe("kairos install test", Label("install-test"), func() {
 	})
 
 	Context("install", func() {
-		Context("Selecting the disk by uuid/label", func() {
-			It("Selects the correct disk if using uuid for target", func() {
-				expectSecureBootEnabled(vm)
-				// Get uuid of main disk
-				uuid, err := vm.Sudo("lsblk /dev/vda -o UUID -n")
-
-				cc := fmt.Sprintf(`#cloud-config
-				install:
-				  auto: true
-				  reboot: true
-				  device: /dev/disk/by-uuid/%s
-				
-				stages:
-				  initramfs:
-					- name: "Set user and password"
-					  users:
-						kairos:
-						  passwd: "kairos"
-					  hostname: kairos-{{ trunc 4 .Random }}
-				`, uuid)
-
-				By("Using the following config")
-				fmt.Fprintf(GinkgoWriter, cc)
-
-				t, err := os.CreateTemp("", "test")
-				ExpectWithOffset(1, err).ToNot(HaveOccurred())
-
-				defer os.RemoveAll(t.Name())
-				err = os.WriteFile(t.Name(), []byte(cc), os.ModePerm)
-				Expect(err).ToNot(HaveOccurred())
-
-				err = vm.Scp(t.Name(), "/tmp/config.yaml", "0770")
-				Expect(err).ToNot(HaveOccurred())
-
-				var out string
-				By("installing kairos", func() {
-					out, err = vm.Sudo(`kairos-agent --debug manual-install --device "auto" /tmp/config.yaml`)
-					Expect(err).ToNot(HaveOccurred(), out)
-					Expect(out).Should(ContainSubstring("Running after-install hook"))
-					vm.Sudo("sync")
-				})
-
-				By("waiting for VM to reboot", func() {
-					vm.Reboot()
-					vm.EventuallyConnects(1200)
-				})
-
-				expectSecureBootEnabled(vm)
-			})
-		})
 		It("cloud-config syntax mixed with extended syntax", func() {
 
 			expectSecureBootEnabled(vm)