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

Jump to bottom

ci/cli: fix active_mode check in upgrade test #1634

Merged
merged 3 commits into from
Oct 22, 2024
Merged

ci/cli: fix active_mode check in upgrade test #1634

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
367d4be
ci/cli: fix active_mode check in upgrade test
ldevulder Oct 21, 2024
ec36e5b
ci/cli: use Stable OS image for downgrade test
ldevulder Oct 22, 2024
ccd20b6
ci/cli: increase OS upgrade check timeout
ldevulder Oct 22, 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
2 changes: 1 addition & 1 deletion .github/workflows/cli-k3s-downgrade-matrix.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,5 @@ jobs:
qase_run_id: ${{ github.event_name == 'schedule' && 'auto' || inputs.qase_run_id }}
rancher_version: stable/latest
test_type: cli
upgrade_image: registry.opensuse.org/isv/rancher/elemental/staging/containers/suse/sl-micro/6.0/baremetal-os-container:latest
upgrade_image: registry.suse.com/suse/sl-micro/6.0/baremetal-os-container:latest
zone: us-central1-b
6 changes: 3 additions & 3 deletions tests/e2e/upgrade_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@ var _ = Describe("E2E - Upgrading node", Label("upgrade-node"), func() {
// This remove the version and keep only the repo, as in the file
// we have the exact version and we don't know it before the upgrade
return tools.TrimStringFromChar(strings.Trim(out, "\n"), ":")
}, tools.SetTimeout(5*time.Minute), 30*time.Second).Should(Equal(valueToCheck))
}, tools.SetTimeout(10*time.Minute), 30*time.Second).Should(Equal(valueToCheck))
})

By("Getting annotations for "+h+" after upgrade", func() {
Expand Down Expand Up @@ -378,14 +378,14 @@ var _ = Describe("E2E - Upgrading node", Label("upgrade-node"), func() {
_ = RunSSHWithRetry(cl, "setsid -f reboot")

// Check the mode after reboot
out = RunSSHWithRetry(cl, "cat /run/cos/recovery_mode")
out = RunSSHWithRetry(cl, "cat /run/elemental/recovery_mode")
Expect(out).To(Not(BeEmpty()))

// Final reboot, in active mode as recovery mode is not persistent
_ = RunSSHWithRetry(cl, "setsid -f reboot")

// Check the mode after fnal reboot
out = RunSSHWithRetry(cl, "cat /run/cos/active_mode")
out = RunSSHWithRetry(cl, "cat /run/elemental/active_mode")
Expect(out).To(Not(BeEmpty()))
})
}
Expand Down
Loading