From fe5d9df71f5443fab6841399916520a441683654 Mon Sep 17 00:00:00 2001 From: Itxaka Date: Wed, 23 Oct 2024 09:58:49 +0200 Subject: [PATCH 1/3] Fix raw disk test Signed-off-by: Itxaka --- tests/e2e/disks_test.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/e2e/disks_test.go b/tests/e2e/disks_test.go index 49c3504..5c2dcf5 100644 --- a/tests/e2e/disks_test.go +++ b/tests/e2e/disks_test.go @@ -140,6 +140,8 @@ install: ## Login users: - name: "kairos" + groups: + - "admin" lock_passwd: true ssh_authorized_keys: - github:mudler From 8c5d809310742e4de3eb197f7f63e4803dd5a836 Mon Sep 17 00:00:00 2001 From: Itxaka Date: Wed, 23 Oct 2024 11:47:37 +0200 Subject: [PATCH 2/3] Bump to latest artifacts for testing Signed-off-by: Itxaka --- tests/e2e/disks_test.go | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/e2e/disks_test.go b/tests/e2e/disks_test.go index 5c2dcf5..d1394f8 100644 --- a/tests/e2e/disks_test.go +++ b/tests/e2e/disks_test.go @@ -31,8 +31,8 @@ var _ = Describe("Disk image generation", Label("raw-disks"), func() { It("generate a raw file", func() { out, err := RunAurora(`--set "disable_http_server=true" \ - --set "artifact_version=v2.4.2" \ - --set "release_version=v2.4.2" \ + --set "artifact_version=v3.2.1" \ + --set "release_version=v3.2.1" \ --set "flavor=rockylinux" \ --set "flavor_release=9" \ --set "disable_netboot=true" \ @@ -55,9 +55,9 @@ var _ = Describe("Disk image generation", Label("raw-disks"), func() { out, err := RunAurora(`--set "disable_http_server=true" \ --set "disable_netboot=true" \ --cloud-config /config.yaml \ - --set "artifact_version=v2.4.2" \ + --set "artifact_version=v3.2.1" \ --set repository="kairos-io/kairos" \ - --set "release_version=v2.4.2" \ + --set "release_version=v3.2.1" \ --set "flavor=rockylinux" \ --set "flavor_release=9" \ --set "disk.gce=true" \ @@ -75,8 +75,8 @@ var _ = Describe("Disk image generation", Label("raw-disks"), func() { It("generates a vhd image", func() { out, err := RunAurora(`--set "disable_http_server=true" \ - --set "artifact_version=v2.4.2" \ - --set "release_version=v2.4.2" \ + --set "artifact_version=v3.2.1" \ + --set "release_version=v3.2.1" \ --set "flavor=rockylinux" \ --set "flavor_release=9" \ --set repository="kairos-io/kairos" \ @@ -174,7 +174,7 @@ stages: }) It("generate a raw build/build/disk.raw (EFI) file", Label("efi"), func() { - image := "quay.io/kairos/core-rockylinux:latest" + image := "quay.io/kairos/opensuse:tumbleweed-core-amd64-generic-v3.2.1" _, err := PullImage(image) Expect(err).ToNot(HaveOccurred()) @@ -194,7 +194,7 @@ stages: }) It("generates a gce image (EFI)", Label("efi"), func() { - image := "quay.io/kairos/core-opensuse-leap-arm-rpi:latest" + image := "quay.io/kairos/opensuse:tumbleweed-core-amd64-generic-v3.2.1" _, err := PullImage(image) Expect(err).ToNot(HaveOccurred()) @@ -215,7 +215,7 @@ stages: }) It("generates a vhd image", Label("efi"), func() { - image := "quay.io/kairos/core-opensuse-leap-arm-rpi:latest" + image := "quay.io/kairos/opensuse:tumbleweed-core-amd64-generic-v3.2.1" _, err := PullImage(image) Expect(err).ToNot(HaveOccurred()) @@ -236,7 +236,7 @@ stages: }) It("generates a raw MBR image", Label("mbr"), func() { - image := "quay.io/kairos/core-opensuse-leap:latest" + image := "quay.io/kairos/opensuse:tumbleweed-core-amd64-generic-v3.2.1" // _, err := PullImage(image) // Expect(err).ToNot(HaveOccurred()) From dcb488234ec895cc49aad07194c1335b00aeda6f Mon Sep 17 00:00:00 2001 From: Itxaka Date: Wed, 23 Oct 2024 11:47:49 +0200 Subject: [PATCH 3/3] Store serial to file on tests so you can tail it while tests are running Signed-off-by: Itxaka --- pkg/ops/disks.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/ops/disks.go b/pkg/ops/disks.go index 1985086..146ebd8 100644 --- a/pkg/ops/disks.go +++ b/pkg/ops/disks.go @@ -157,8 +157,8 @@ mkisofs -output ci.iso -volid cidata -joliet -rock user-data meta-data truncate -s "+$((20000*1024*1024))" %s %s -m %s -smp cores=%s \ + -chardev stdio,mux=on,id=char0,logfile=/tmp/serial.log,signal=off -serial chardev:char0 -mon chardev=char0 \ -nographic \ - -serial mon:stdio \ -rtc base=utc,clock=rt \ -chardev socket,path=qga.sock,server,nowait,id=qga0 \ -device virtio-serial \