Skip to content

add integration server tests for resources version checks #17312

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.

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

Draft
wants to merge 14 commits into
base: main
Choose a base branch
from
Draft
17 changes: 10 additions & 7 deletions integrationservertest/apm-version-bug_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -128,12 +128,12 @@ func TestAPMResourcesVersionBug(t *testing.T) {
}
}

version8162 := ech.NewVersion(8, 16, 2, "SNAPSHOT")
version8177 := ech.NewVersion(8, 17, 7, "SNAPSHOT")
version8178 := ech.NewVersion(8, 17, 8, "SNAPSHOT") // latest 8.17
version8182 := ech.NewVersion(8, 18, 2, "SNAPSHOT")
version8183 := ech.NewVersion(8, 18, 3, "SNAPSHOT") // latest 8.18
version8190 := ech.NewVersion(8, 19, 0, "SNAPSHOT") // latest 8.19
version8162 := vsCache.GetLatestVersionOrSkip(t, "8.16.2")
version8177 := vsCache.GetLatestVersionOrSkip(t, "8.17.7")
version8178 := vsCache.GetLatestBCOrSkip(t, "8.17.8") // latest 8.17 as of today
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will skip the whole test entirely if the BC does not exist. Since both GetLatestVersionOrSkip and GetLatestBCOrSkip are not used currently, you can update them to achieve what you need instead.

version8182 := vsCache.GetLatestVersionOrSkip(t, "8.18.2")
version8183 := vsCache.GetLatestBCOrSkip(t, "8.18.3") // latest 8.18 as of today
// version8190 := vsCache.GetLatestBCOrSkip(t, "8.19.0") // latest 8.19 as of today
// the event.ingested change was introduced in 8.16.3, as
// it only shows if we upgrade a cluster from a version with
// the bug we need to start from 8.16.2.
Expand Down Expand Up @@ -176,6 +176,10 @@ func TestAPMResourcesVersionBug(t *testing.T) {
})

t.Run("8.18.3 to 8.19.0", func(t *testing.T) {
// FIXME: use 8.19.0 BC when it becomes available.
start := vsCache.GetLatestSnapshot(t, "8.16.2")
version8183 := vsCache.GetLatestSnapshot(t, "8.18.3")
version8190 := vsCache.GetLatestSnapshot(t, "8.19.0")
versions := []ech.Version{start, version8183, version8190}
steps := twoUpgradesSomeThenSome(t, versions, config)
steps = append(steps, checkFieldExistsInDocsStep{
Expand All @@ -187,6 +191,5 @@ func TestAPMResourcesVersionBug(t *testing.T) {
Steps: steps,
}
runner.Run(t)

})
}