From eef8525a4b7febf05863c19bac2d8c57bf4d545d Mon Sep 17 00:00:00 2001
From: Santiago <santiagohernandez.1997@gmail.com>
Date: Wed, 22 Nov 2023 19:13:04 +0100
Subject: [PATCH] Alerting: Fix remote Alertmanager integration tests
 (CI/Makefile) (#78541)

* Alerting: Fix remote Alertmanager integration tests (CI/Makefile)
---
 .drone.yml                   | 8 ++++----
 Makefile                     | 2 +-
 scripts/drone/steps/lib.star | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index a02ccf27c7c..c8fd7a66c62 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -975,7 +975,7 @@ steps:
 - commands:
   - apk add --update build-base
   - go clean -testcache
-  - go test -run TestIntegrationRemoteAlertmanager -covermode=atomic -timeout=2m ./pkg/services/ngalert/notifier/...
+  - go test -run TestIntegrationRemoteAlertmanager -covermode=atomic -timeout=2m ./pkg/services/ngalert/...
   depends_on:
   - wire-install
   - wait-for-remote-alertmanager
@@ -2326,7 +2326,7 @@ steps:
 - commands:
   - apk add --update build-base
   - go clean -testcache
-  - go test -run TestIntegrationRemoteAlertmanager -covermode=atomic -timeout=2m ./pkg/services/ngalert/notifier/...
+  - go test -run TestIntegrationRemoteAlertmanager -covermode=atomic -timeout=2m ./pkg/services/ngalert/...
   depends_on:
   - wire-install
   - wait-for-remote-alertmanager
@@ -3989,7 +3989,7 @@ steps:
 - commands:
   - apk add --update build-base
   - go clean -testcache
-  - go test -run TestIntegrationRemoteAlertmanager -covermode=atomic -timeout=2m ./pkg/services/ngalert/notifier/...
+  - go test -run TestIntegrationRemoteAlertmanager -covermode=atomic -timeout=2m ./pkg/services/ngalert/...
   depends_on:
   - wire-install
   - wait-for-remote-alertmanager
@@ -4685,6 +4685,6 @@ kind: secret
 name: gcr_credentials
 ---
 kind: signature
-hmac: e5f8ac3263b36e17d1b6c0b4ec7f9658babff30065f4742d3b570a918e1f680d
+hmac: 64302d9316abab775d7ec1132f26ea4f1829558fa0bfd85812597182c1abe61a
 
 ...
diff --git a/Makefile b/Makefile
index 686e7f55b4d..d8b0970a4be 100644
--- a/Makefile
+++ b/Makefile
@@ -185,7 +185,7 @@ test-go-integration-alertmanager: ## Run integration tests for the remote alertm
 	@echo "test remote alertmanager integration tests"
 	$(GO) clean -testcache
 	AM_URL=http://localhost:8080 AM_TENANT_ID=test AM_PASSWORD=test \
-	$(GO) test -count=1 -run "^TestIntegrationRemoteAlertmanager" -covermode=atomic -timeout=5m ./pkg/services/ngalert/notifier/...
+	$(GO) test -count=1 -run "^TestIntegrationRemoteAlertmanager" -covermode=atomic -timeout=5m ./pkg/services/ngalert/...
 
 .PHONY: test-go-integration-postgres
 test-go-integration-postgres: devenv-postgres ## Run integration tests for postgres backend with flags.
diff --git a/scripts/drone/steps/lib.star b/scripts/drone/steps/lib.star
index a8770398c17..b1080f7420b 100644
--- a/scripts/drone/steps/lib.star
+++ b/scripts/drone/steps/lib.star
@@ -966,7 +966,7 @@ def redis_integration_tests_steps():
 def remote_alertmanager_integration_tests_steps():
     cmds = [
         "go clean -testcache",
-        "go test -run TestIntegrationRemoteAlertmanager -covermode=atomic -timeout=2m ./pkg/services/ngalert/notifier/...",
+        "go test -run TestIntegrationRemoteAlertmanager -covermode=atomic -timeout=2m ./pkg/services/ngalert/...",
     ]
 
     environment = {