Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] master from kairos-io:master #98

Merged
merged 4 commits into from
Dec 17, 2024
+7 −6
Merged

[pull] master from kairos-io:master #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
610e1e1
Try to fix test by checking the correct file for logs
jimmykarily Dec 16, 2024
722f21a
Fix test checking with the wrong file name
jimmykarily Dec 16, 2024
dc48629
Revert test fix (because we reverted kairos-agent too)
jimmykarily Dec 16, 2024
3acb5e1
Fix test by checking the version in os-release for older release
jimmykarily Dec 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions tests/provider_upgrade_k8s_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ var _ = Describe("k3s upgrade test", Label("provider", "provider-upgrade-k8s"),

By("Checking agent provider correct start")
Eventually(func() string {
out, _ := vm.Sudo("cat /var/log/kairos/agent-provider.log")
out, _ := vm.Sudo("cat /var/log/kairos/provider-*.log")
return out
}, 900*time.Second, 10*time.Second).Should(Or(ContainSubstring("One time bootstrap starting"), ContainSubstring("Sentinel exists")))

Expand All @@ -107,8 +107,9 @@ var _ = Describe("k3s upgrade test", Label("provider", "provider-upgrade-k8s"),
out, err = vm.Sudo("logrotate -vf /etc/logrotate.d/kairos")
Expect(err).ToNot(HaveOccurred())
Expect(out).To(ContainSubstring("log needs rotating"))
_, err = vm.Sudo("ls /var/log/kairos/agent-provider.log.1.gz")
Expect(err).ToNot(HaveOccurred())
// Check that we have some rotated logs
out, err = vm.Sudo("[ $(ls /var/log/kairos/agent-*log.1.gz 2>/dev/null | wc -l) -gt 0 ]")
Expect(err).ToNot(HaveOccurred(), out)

By("wait system-upgrade-controller")
Eventually(func() string {
Expand Down Expand Up @@ -170,7 +171,7 @@ var _ = Describe("k3s upgrade test", Label("provider", "provider-upgrade-k8s"),
By("validate upgraded version")
Eventually(func() string {
out, _ = kubectl(vm, "get pods -A")
version, _ := vm.Sudo(getVersionCmd)
version, _ := vm.Sudo(getVersionCmdOsRelease)
fmt.Printf("version = %+v\n", version)
return version
}, 30*time.Minute, 10*time.Second).Should(ContainSubstring(version), func() string {
Expand Down
2 changes: 1 addition & 1 deletion tests/provider_upgrade_latest_k8s_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ var _ = Describe("k3s upgrade test from k8s", Label("provider", "provider-upgrad

By("Checking agent provider correct start")
Eventually(func() string {
out, _ := vm.Sudo("cat /var/log/kairos/agent-provider.log")
out, _ := vm.Sudo("cat /var/log/kairos/provider-*.log")
return out
}, 900*time.Second, 10*time.Second).Should(Or(ContainSubstring("One time bootstrap starting"), ContainSubstring("Sentinel exists")))

Expand Down
2 changes: 1 addition & 1 deletion tests/uki_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ var _ = Describe("kairos UKI test", Label("uki"), Ordered, func() {
out, err = vm.Sudo("cat /sys/firmware/efi/efivars/LoaderEntrySelected-*")
Expect(err).ToNot(HaveOccurred(), out)
selectedEntry := removeSpecialChars(out)
Expect(selectedEntry).To(Equal(fmt.Sprintf("%s+3.conf", strings.TrimSpace(os.Getenv("EXPECTED_SINGLE_ENTRY")))))
Expect(selectedEntry).To(Equal(fmt.Sprintf("%s.conf", strings.TrimSpace(os.Getenv("EXPECTED_SINGLE_ENTRY")))))
})
})

Expand Down
Loading