From 9da238e476882ef0136896319dd0bb0dfe9ea655 Mon Sep 17 00:00:00 2001 From: apmmachine Date: Mon, 8 Apr 2024 00:21:10 +0000 Subject: [PATCH 1/3] [main][Automation] Update .agent-versions.json This file is used for picking agent versions in integration tests. The file's 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: ```json { "UpgradeToVersion": "8.14.0", "CurrentMajors": 2, "PreviousMajors": 1, "PreviousMinors": 1, "SnapshotBranches": [ "8.13", "8.12", "7.17" ] } ``` --- .agent-versions.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.agent-versions.json b/.agent-versions.json index cea3993e8b2..cebf78a45ee 100644 --- a/.agent-versions.json +++ b/.agent-versions.json @@ -1,10 +1,10 @@ { "testVersions": [ - "8.13.0-SNAPSHOT", + "8.13.2-SNAPSHOT", + "8.13.1", + "8.13.0", "8.12.3-SNAPSHOT", - "8.12.2", - "8.12.1", - "7.17.19-SNAPSHOT", - "7.17.18" + "7.17.20-SNAPSHOT", + "7.17.19" ] } From ac7bc4d588cf6515efd4c544fb51192daedbdbdc Mon Sep 17 00:00:00 2001 From: Craig MacKenzie Date: Mon, 8 Apr 2024 09:33:20 -0400 Subject: [PATCH 2/3] Test 8.12.2 instead of 8.13.0 --- .agent-versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.agent-versions.json b/.agent-versions.json index cebf78a45ee..05c8c7d25b0 100644 --- a/.agent-versions.json +++ b/.agent-versions.json @@ -2,7 +2,7 @@ "testVersions": [ "8.13.2-SNAPSHOT", "8.13.1", - "8.13.0", + "8.12.2", "8.12.3-SNAPSHOT", "7.17.20-SNAPSHOT", "7.17.19" From 5c68484d56228f9991fd55812a6980a62a48fe54 Mon Sep 17 00:00:00 2001 From: Denis Rechkunov Date: Mon, 8 Apr 2024 16:02:59 +0200 Subject: [PATCH 3/3] Change version requirements to match the manual selection --- .agent-versions.json | 2 +- magefile.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.agent-versions.json b/.agent-versions.json index 05c8c7d25b0..a972029838c 100644 --- a/.agent-versions.json +++ b/.agent-versions.json @@ -2,8 +2,8 @@ "testVersions": [ "8.13.2-SNAPSHOT", "8.13.1", - "8.12.2", "8.12.3-SNAPSHOT", + "8.12.2", "7.17.20-SNAPSHOT", "7.17.19" ] diff --git a/magefile.go b/magefile.go index 607257a3b09..d73b61e8817 100644 --- a/magefile.go +++ b/magefile.go @@ -1606,8 +1606,8 @@ func (Integration) UpdateVersions(ctx context.Context) error { reqs := upgradetest.VersionRequirements{ UpgradeToVersion: bversion.Agent, - CurrentMajors: 2, - PreviousMinors: 1, + CurrentMajors: 1, + PreviousMinors: 2, PreviousMajors: 1, SnapshotBranches: branches, }