From 6d70c114d32095bca0421d052b5a2a4592b96d37 Mon Sep 17 00:00:00 2001
From: Michel Laterman <82832767+michel-laterman@users.noreply.github.com>
Date: Mon, 19 Aug 2024 12:17:09 -0700
Subject: [PATCH 1/5] Increase watcher in upgrade tests to timeout after 10m
 (#5270)

Increase watcher in upgrade tests to timeout after 10m to catch any regressions for the agent upgrade watcher.

(cherry picked from commit 6b591eb4f0b9c71f51bd30639471f4027958d87c)

# Conflicts:
#	.agent-versions.json
---
 .agent-versions.json            | 5 +++++
 testing/upgradetest/upgrader.go | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/.agent-versions.json b/.agent-versions.json
index 9a2fc2211af..57ca0bef866 100644
--- a/.agent-versions.json
+++ b/.agent-versions.json
@@ -4,7 +4,12 @@
     "8.14.2",
     "8.13.4",
     "8.14.4-SNAPSHOT",
+<<<<<<< HEAD
     "7.17.23-SNAPSHOT",
     "7.17.22"
+=======
+    "8.14.3",
+    "7.17.24-SNAPSHOT"
+>>>>>>> 6b591eb4f0 (Increase watcher in upgrade tests to timeout after 10m (#5270))
   ]
 }
diff --git a/testing/upgradetest/upgrader.go b/testing/upgradetest/upgrader.go
index b8e8f70feb3..72053779a36 100644
--- a/testing/upgradetest/upgrader.go
+++ b/testing/upgradetest/upgrader.go
@@ -382,11 +382,11 @@ func PerformUpgrade(
 	}
 
 	// it is unstable to continue until the watcher is done
-	// the maximum wait time is 1 minutes (2 minutes for grace) some older versions
+	// the maximum wait time is 10 minutes (12 minutes for grace) some older versions
 	// do not respect the `ConfigureFastWatcher` so we have to kill the watcher after the
-	// 1 minute window (1 min 15 seconds for grace) has passed.
+	// 10 minute window (10 min 15 seconds for grace) has passed.
 	logger.Logf("waiting for upgrade watcher to finish")
-	err = WaitForNoWatcher(ctx, 2*time.Minute, 10*time.Second, 1*time.Minute+15*time.Second)
+	err = WaitForNoWatcher(ctx, 12*time.Minute, 10*time.Second, 10*time.Minute+15*time.Second)
 	if err != nil {
 		return fmt.Errorf("watcher never stopped running: %w", err)
 	}

From ae987139190ee1ad4959055e47b1da7ab4c2ffcf Mon Sep 17 00:00:00 2001
From: Anderson Queiroz <anderson.queiroz@elastic.co>
Date: Tue, 3 Sep 2024 18:03:32 +0200
Subject: [PATCH 2/5] Update .agent-versions.json

---
 .agent-versions.json | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/.agent-versions.json b/.agent-versions.json
index 57ca0bef866..b62268ac242 100644
--- a/.agent-versions.json
+++ b/.agent-versions.json
@@ -1,15 +1,8 @@
 {
   "testVersions": [
     "8.15.0-SNAPSHOT",
-    "8.14.2",
-    "8.13.4",
-    "8.14.4-SNAPSHOT",
-<<<<<<< HEAD
-    "7.17.23-SNAPSHOT",
-    "7.17.22"
-=======
     "8.14.3",
+    "8.14.4-SNAPSHOT",
     "7.17.24-SNAPSHOT"
->>>>>>> 6b591eb4f0 (Increase watcher in upgrade tests to timeout after 10m (#5270))
   ]
 }

From 137ec41cfcabf4fec2f9e74ddac2de45ad5dce03 Mon Sep 17 00:00:00 2001
From: Anderson Queiroz <anderson.queiroz@elastic.co>
Date: Tue, 3 Sep 2024 18:04:11 +0200
Subject: [PATCH 3/5] use main version .agent-versions.json

---
 .agent-versions.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.agent-versions.json b/.agent-versions.json
index b62268ac242..9acfaf293b4 100644
--- a/.agent-versions.json
+++ b/.agent-versions.json
@@ -1,8 +1,9 @@
 {
   "testVersions": [
+    "8.15.0",
     "8.15.0-SNAPSHOT",
-    "8.14.3",
     "8.14.4-SNAPSHOT",
+    "8.14.3",
     "7.17.24-SNAPSHOT"
   ]
 }

From f82e039dabc8079f70b5f33120a5293c0589092e Mon Sep 17 00:00:00 2001
From: Anderson Queiroz <anderson.queiroz@elastic.co>
Date: Tue, 3 Sep 2024 18:05:21 +0200
Subject: [PATCH 4/5] Update .agent-versions.json

---
 .agent-versions.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.agent-versions.json b/.agent-versions.json
index 9acfaf293b4..3814d2fca61 100644
--- a/.agent-versions.json
+++ b/.agent-versions.json
@@ -1,6 +1,5 @@
 {
   "testVersions": [
-    "8.15.0",
     "8.15.0-SNAPSHOT",
     "8.14.4-SNAPSHOT",
     "8.14.3",

From b18be7897eeb5e3cf4415f2b20863bc981be791f Mon Sep 17 00:00:00 2001
From: Anderson Queiroz <anderson.queiroz@elastic.co>
Date: Tue, 3 Sep 2024 18:06:18 +0200
Subject: [PATCH 5/5] Update .agent-versions.json

---
 .agent-versions.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.agent-versions.json b/.agent-versions.json
index 3814d2fca61..7e71a32f91b 100644
--- a/.agent-versions.json
+++ b/.agent-versions.json
@@ -1,8 +1,9 @@
 {
   "testVersions": [
-    "8.15.0-SNAPSHOT",
+    "8.13.4",
     "8.14.4-SNAPSHOT",
     "8.14.3",
+    "8.15.0-SNAPSHOT",
     "7.17.24-SNAPSHOT"
   ]
 }