public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Alerting: Fix remote Alertmanager integration tests (CI/Makefile) (#78541)

Browse Source 
* Alerting: Fix remote Alertmanager integration tests (CI/Makefile)
This commit is contained in:
Santiago
2023-11-22 18:13:04 +00:00
committed by GitHub
parent d47ac2f67e
commit eef8525a4b
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.drone.yml
+4 -4
View File
@@ -975,7 +975,7 @@ steps:
- commands: - commands:
- apk add --update build-base - apk add --update build-base
- go clean -testcache - 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: depends_on:
- wire-install - wire-install
- wait-for-remote-alertmanager - wait-for-remote-alertmanager
@@ -2326,7 +2326,7 @@ steps:
- commands: - commands:
- apk add --update build-base - apk add --update build-base
- go clean -testcache - 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: depends_on:
- wire-install - wire-install
- wait-for-remote-alertmanager - wait-for-remote-alertmanager
@@ -3989,7 +3989,7 @@ steps:
- commands: - commands:
- apk add --update build-base - apk add --update build-base
- go clean -testcache - 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: depends_on:
- wire-install - wire-install
- wait-for-remote-alertmanager - wait-for-remote-alertmanager
@@ -4685,6 +4685,6 @@ kind: secret
name: gcr_credentials name: gcr_credentials
--- ---
kind: signature kind: signature
hmac: e5f8ac3263b36e17d1b6c0b4ec7f9658babff30065f4742d3b570a918e1f680d hmac: 64302d9316abab775d7ec1132f26ea4f1829558fa0bfd85812597182c1abe61a
... ...
Makefile
+1 -1
View File
@@ -185,7 +185,7 @@ test-go-integration-alertmanager: ## Run integration tests for the remote alertm
@echo "test remote alertmanager integration tests" @echo "test remote alertmanager integration tests"
$(GO) clean -testcache $(GO) clean -testcache
AM_URL=http://localhost:8080 AM_TENANT_ID=test AM_PASSWORD=test \ 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 .PHONY: test-go-integration-postgres
test-go-integration-postgres: devenv-postgres ## Run integration tests for postgres backend with flags. test-go-integration-postgres: devenv-postgres ## Run integration tests for postgres backend with flags.
scripts/drone/steps/lib.star
+1 -1
View File
@@ -966,7 +966,7 @@ def redis_integration_tests_steps():
def remote_alertmanager_integration_tests_steps(): def remote_alertmanager_integration_tests_steps():
cmds = [ cmds = [
"go clean -testcache", "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 = { environment = {