Skip to content
Merged
Changes from all commits
Commits
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
25 changes: 25 additions & 0 deletions testing/integration/ess/upgrade_integrations_server_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ func TestUpgradeIntegrationsServer(t *testing.T) {
statefulProv, ok := prov.(*ess.StatefulProvisioner)
require.True(t, ok)

startVersions = filterVersionsForECH(t, startVersions, statefulProv)

t.Logf("Running test cases for upgrade from versions [%v] to version [%s]", startVersions, endVersion)
for _, startVersion := range startVersions {
t.Logf("Running test case for upgrade from version [%s] to version [%s]...", startVersion.String(), endVersion)
Expand Down Expand Up @@ -127,3 +129,26 @@ func getUpgradeableFIPSVersions(t *testing.T) version.SortableParsedVersions {
sort.Sort(sortedVers)
return sortedVers
}

func filterVersionsForECH(t *testing.T, versions []*version.ParsedSemVer, echProv *ess.StatefulProvisioner) []*version.ParsedSemVer {
echVersions, err := echProv.AvailableVersions()
require.NoError(t, err)

filteredVersions := make([]*version.ParsedSemVer, 0)
for _, ver := range versions {
if isVersionInList(ver, echVersions) {
filteredVersions = append(filteredVersions, ver)
}
}

return filteredVersions
}

func isVersionInList(candidateVersion *version.ParsedSemVer, allowedVersions []*version.ParsedSemVer) bool {
for _, allowedVersion := range allowedVersions {
if allowedVersion.Equal(*candidateVersion) {
return true
}
}
return false
}
Loading