Skip to content

Commit

Permalink
Both ci.yaml and test_prometheus_rules.yaml were using same lock (#524)
Browse files Browse the repository at this point in the history
Those files had the same configuration for concurrency which blocked the
CI with the message: Canceling since a deadlock for concurrency group
'Release to latest/edge-refs/heads/2/edge' was detected between
'ci-tests' and 'ci-tests.promtool'

This PR adds completly the promtool into the ci.yaml file
  • Loading branch information
gabrielcocenza authored Dec 18, 2024
1 parent 78c448a commit c11cd1c
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 29 deletions.
17 changes: 16 additions & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,22 @@ jobs:
run: tox run -e unit

promtool:
uses: ./.github/workflows/test_prometheus_rules.yaml
runs-on: ubuntu-latest
steps:
- name: Checkout repo
uses: actions/checkout@v4

# prometheus snap includes promtool
- name: Install prometheus snap
run: sudo snap install prometheus

- name: Check validity of prometheus alert rules
run: |
promtool check rules src/alert_rules/prometheus/*.yaml
- name: Run unit tests for prometheus alert rules
run: |
promtool test rules tests/unit/test_alert_rules/*.yaml
terraform-test:
name: Terraform - Lint and Simple Deployment
Expand Down
28 changes: 0 additions & 28 deletions .github/workflows/test_prometheus_rules.yaml

This file was deleted.

0 comments on commit c11cd1c

Please sign in to comment.