diff --git a/Earthfile b/Earthfile index 8b5bfd940..1ec7f4319 100644 --- a/Earthfile +++ b/Earthfile @@ -8,7 +8,7 @@ ARG TRIVY_VERSION=0.55.2 # renovate: datasource=docker depName=anchore/grype versioning=semver ARG GRYPE_VERSION=v0.80.1 # renovate: datasource=docker depName=quay.io/kairos/framework versioning=semver -ARG KAIROS_FRAMEWORK_VERSION=v2.12.1 +ARG KAIROS_FRAMEWORK_VERSION=v2.12.4 # renovate: datasource=docker depName=quay.io/kairos/osbuilder-tools versioning=semver ARG OSBUILDER_VERSION=v0.300.3 # renovate: datasource=docker depName=golang versioning=semver diff --git a/tests/reset_test.go b/tests/reset_test.go index 568af8dd1..19a998c01 100644 --- a/tests/reset_test.go +++ b/tests/reset_test.go @@ -38,6 +38,7 @@ var _ = Describe("kairos reset test", Label("reset-test"), func() { Or( ContainSubstring("foobarzz"), )) + By("Creating files on persistent and oem") _, err := vm.Sudo("touch /usr/local/test") Expect(err).ToNot(HaveOccurred()) @@ -46,12 +47,15 @@ var _ = Describe("kairos reset test", Label("reset-test"), func() { vm.HasFile("/oem/test") vm.HasFile("/usr/local/test") - + By("Setting the next entry to statereset") _, err = vm.Sudo("grub2-editenv /oem/grubenv set next_entry=statereset") Expect(err).ToNot(HaveOccurred()) - + By("Rebooting") vm.Reboot() + expectRebootedToActive(vm) + + By("Checking that persistent file is gone") Eventually(func() string { out, _ := vm.Sudo("if [ -f /usr/local/test ]; then echo ok; else echo wrong; fi") return out @@ -59,6 +63,7 @@ var _ = Describe("kairos reset test", Label("reset-test"), func() { Or( ContainSubstring("wrong"), )) + By("Checking that oem file is still there") Eventually(func() string { out, _ := vm.Sudo("if [ -f /oem/test ]; then echo ok; else echo wrong; fi") return out