Skip to content

Fix version check in rollback tests #9181

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

Merged
merged 1 commit into from
Jul 30, 2025
Merged

Fix version check in rollback tests #9181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions testing/integration/ess/upgrade_rollback_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ inputs:
}

assert.Equal(t, details.StateRollback, details.State(state.UpgradeDetails.State))
if !startVersion.Less(*upgradetest.Version_9_1_0_SNAPSHOT) {
if !startVersion.Less(*upgradetest.Version_9_2_0_SNAPSHOT) {
assert.Equal(t, details.ReasonWatchFailed, state.UpgradeDetails.Metadata.Reason)
}
} else {
Expand Down Expand Up @@ -382,7 +382,7 @@ func managedRollbackRestartTest(ctx context.Context, t *testing.T, info *define.
require.NoError(t, fleetAgentErr, "error getting agent from Fleet")
require.NotNil(t, fleetAgent.UpgradeDetails, "upgrade details not set")
assert.Equal(t, details.StateRollback, details.State(fleetAgent.UpgradeDetails.State))
if !startVersion.Less(*upgradetest.Version_9_1_0_SNAPSHOT) {
if !startVersion.Less(*upgradetest.Version_9_2_0_SNAPSHOT) {
assert.Equal(t, details.ReasonWatchFailed, fleetAgent.UpgradeDetails.Metadata.Reason)
}
}
Expand Down Expand Up @@ -457,7 +457,7 @@ func standaloneRollbackRestartTest(ctx context.Context, t *testing.T, startFixtu

require.NotNil(t, state.UpgradeDetails)
assert.Equal(t, details.StateRollback, details.State(state.UpgradeDetails.State))
if !startVersion.Less(*upgradetest.Version_9_1_0_SNAPSHOT) {
if !startVersion.Less(*upgradetest.Version_9_2_0_SNAPSHOT) {
assert.Equal(t, details.ReasonWatchFailed, state.UpgradeDetails.Metadata.Reason)
}
}
Expand Down
4 changes: 3 additions & 1 deletion testing/upgradetest/versions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,11 @@ var (
Version_8_19_0_SNAPSHOT = version.NewParsedSemVer(8, 19, 0, "SNAPSHOT", "")

// Version_9_1_0_SNAPSHOT is a FIPS-capable artifact.
// Version_9_1_0_SNAPSHOT is the minimum version for manual rollback and rollback reason
Version_9_1_0_SNAPSHOT = version.NewParsedSemVer(9, 1, 0, "SNAPSHOT", "")

// Version_9_2_0_SNAPSHOT is the minimum version for manual rollback and rollback reason
Version_9_2_0_SNAPSHOT = version.NewParsedSemVer(9, 2, 0, "SNAPSHOT", "")

// ErrNoSnapshot is returned when a requested snapshot is not on the version list.
ErrNoSnapshot = errors.New("failed to find a snapshot on the version list")
// ErrNoPreviousMinor is returned when a requested previous minor is not on the version list.
Expand Down
Loading