integration-server-test: Don't notify if not run from main (elastic#17209)

* Fix 9.1 upgrade test failure due to apm-data changes

* Add context canceled error log; Update notify to fire on main only

* Revert "Fix 9.1 upgrade test failure due to apm-data changes"

This reverts commit aeddc56.

Author: ericywl

.github/workflows/integration-server-test.yml

@@ -88,7 +88,7 @@ jobs:
           SCENARIO="${{ matrix.scenario }}" make integration-server-standalone-test
 
   notify:
-    if: always()
+    if: github.ref == 'refs/heads/main'
     runs-on: ubuntu-latest
     needs:
       - run-upgrade

.github/workflows/smoke-tests-os-sched.yml

@@ -48,7 +48,7 @@ jobs:
 
   notify:
     name: Notify
-    if: always()
+    if: github.ref == 'refs/heads/main'
     runs-on: ubuntu-latest
     needs:
       - smoke-tests-os

integrationservertest/logs_filters.go

@@ -102,12 +102,18 @@ var (
 		},
 	})
 
-	syncSourcemapContextCanceled = apmErrorLog(types.Query{
+	initialSearchQueryContextCanceled = apmErrorLog(types.Query{
 		MatchPhrase: map[string]types.MatchPhraseQuery{
 			"message": {Query: "failed to sync sourcemaps metadata: failed to run initial search query: fetcher unavailable: context canceled"},
 		},
 	})
 
+	scrollSearchQueryContextCanceled = apmErrorLog(types.Query{
+		MatchPhrase: map[string]types.MatchPhraseQuery{
+			"message": {Query: "failed to sync sourcemaps metadata: failed scroll search: failed to run scroll search query: context canceled"},
+		},
+	})
+
 	waitServerReadyCtxCanceled = apmErrorLog(types.Query{
 		MatchPhrase: map[string]types.MatchPhraseQuery{
 			"message": {Query: "error waiting for server to be ready: context canceled"},

integrationservertest/upgrade_test.go

@@ -158,7 +158,8 @@ func buildTestSteps(t *testing.T, versions ech.Versions, config upgradeTestConfi
 			preconditionFailed,
 			populateSourcemapFetcher403,
 			populateSourcemapServerShuttingDown,
-			syncSourcemapContextCanceled,
+			initialSearchQueryContextCanceled,
+			scrollSearchQueryContextCanceled,
 		},
 	})