Skip to content

Commit 45007d3

Browse files
[9.1][Automation] Update versions (#9297)
* [9.1][Automation] Update versions These files are used for picking the starting (pre-upgrade) or ending (post-upgrade) agent versions in upgrade integration tests. The content is based on responses from https://www.elastic.co/api/product_versions and https://snapshots.elastic.co The current update is generated based on the following requirements: Package version: ```json { "version": "9.1.1-SNAPSHOT", "build_id": "9.1.1-e8fd9f6e", "manifest_url": "https://snapshots.elastic.co/9.1.1-e8fd9f6e/manifest-9.1.1-SNAPSHOT.json", "summary_url": "https://snapshots.elastic.co/9.1.1-e8fd9f6e/summary-9.1.1-SNAPSHOT.html", "core_version": "9.1.1", "stack_build_id": "9.1.1-e8fd9f6e-SNAPSHOT" } ``` ```json { "UpgradeToVersion": "9.1.2", "CurrentMajors": 1, "PreviousMajors": 1, "PreviousMinors": 2, "SnapshotBranches": [ "9.1", "9.0", "8.19", "7.17" ] } ``` * Only upgrade from SNAPSHOT->SNAPSHOT or non-SNAPSHOT->non-SNAPSHOT --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Shaunak Kashyap <[email protected]>
1 parent 1996402 commit 45007d3

File tree

3 files changed

+21
-3
lines changed

3 files changed

+21
-3
lines changed

.package-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
"summary_url": "https://snapshots.elastic.co/9.1.1-e8fd9f6e/summary-9.1.1-SNAPSHOT.html",
66
"core_version": "9.1.1",
77
"stack_build_id": "9.1.1-e8fd9f6e-SNAPSHOT"
8-
}
8+
}

testing/integration/ess/upgrade_integrations_server_test.go

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ func TestUpgradeIntegrationsServer(t *testing.T) {
5959
require.True(t, ok)
6060

6161
startVersions = filterVersionsForECH(t, startVersions, statefulProv)
62+
startVersions = filterVersionsForSameReleaseType(t, startVersions, endVersion)
6263

6364
t.Logf("Running test cases for upgrade from versions [%v] to version [%s]", startVersions, endVersion)
6465
for _, startVersion := range startVersions {
@@ -152,3 +153,20 @@ func isVersionInList(candidateVersion *version.ParsedSemVer, allowedVersions []*
152153
}
153154
return false
154155
}
156+
157+
func filterVersionsForSameReleaseType(t *testing.T, versions []*version.ParsedSemVer, endVersion string) []*version.ParsedSemVer {
158+
endVersionParsed, err := version.ParseVersion(endVersion)
159+
require.NoError(t, err)
160+
isEndVersionSnapshot := endVersionParsed.IsSnapshot()
161+
162+
filteredVersions := make([]*version.ParsedSemVer, 0)
163+
for _, ver := range versions {
164+
if isEndVersionSnapshot && ver.IsSnapshot() {
165+
filteredVersions = append(filteredVersions, ver)
166+
} else if !isEndVersionSnapshot && !ver.IsSnapshot() {
167+
filteredVersions = append(filteredVersions, ver)
168+
}
169+
}
170+
171+
return filteredVersions
172+
}

testing/integration/testdata/.upgrade-test-agent-versions.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
testVersions:
88
- 9.0.5-SNAPSHOT
99
- 9.0.4
10-
- 8.19.0
11-
- 8.19.0-SNAPSHOT
10+
- 8.19.1
11+
- 8.19.1-SNAPSHOT
1212
- 7.17.30-SNAPSHOT

0 commit comments

Comments
 (0)