Merge pull request #73 from kairos-io/improvements

kairos-io · Oct 23, 2024 · 3575bcc · 3575bcc
2 parents 076e3d9 + dcb4882
commit 3575bcc
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git 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 \

diff --git a/tests/e2e/disks_test.go b/tests/e2e/disks_test.go
@@ -29,8 +29,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" \
@@ -53,9 +53,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" \
@@ -73,8 +73,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" \
@@ -140,6 +140,8 @@ install:
 ## Login
 users:
 - name: "kairos"
+  groups:
+    - "admin"
   lock_passwd: true
   ssh_authorized_keys:
   - github:mudler
@@ -169,7 +171,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())
 
@@ -189,7 +191,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())
 
@@ -210,7 +212,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())
 
@@ -231,7 +233,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())