ci: serialize terraform and deploy runs with concurrency guards (#114)
Some checks failed
Deploy (on merge) / Discover hosts (push) Waiting to run
Deploy (on merge) / deploy (push) Blocked by required conditions
Terraform / Plan (push) Has been cancelled
Terraform / Apply (push) Has been cancelled

* ci: serialize infra runs and enable terraform state locking

Add concurrency guards to the terraform and deploy-on-merge workflows so
two merges in quick succession can't run against the same state or the
same hosts at once (queue, never cancel an in-flight run).

Enable native S3 state locking (use_lockfile) on the Backblaze B2 backend,
which needs OpenTofu 1.10+, so bump the CI tofu version 1.9.0 -> 1.10.10
and the required_version constraint to >= 1.10.0.

* ci: bump tofu to 1.10.10 in the validate workflow too

Missed this one in the last commit — the PR-time validate still pinned
1.9.0, which trips the new required_version >= 1.10.0 constraint.

* ci: drop use_lockfile — Backblaze B2 can't do native state locking

B2's S3 API returns 501 NotImplemented for the conditional PutObject that
use_lockfile relies on, so tofu plan/apply fails to acquire the lock.
Revert the lockfile and the 1.10 version bump it required; rely on the
concurrency guard to serialize applies instead. Left a note in the
backend block so this isn't re-attempted.
This commit is contained in:
Rasmus Wejlgaard 2026-06-02 19:39:13 +01:00 committed by GitHub
parent 45dff99e7c
commit 65090ca9d6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 17 additions and 0 deletions

View file

@ -7,6 +7,12 @@ on:
paths-ignore:
- "terraform/**"
# Serialize fleet deploys so two quick merges can't run Ansible against the
# same hosts at once. Don't cancel an in-flight deploy mid-run — queue it.
concurrency:
group: deploy-on-merge
cancel-in-progress: false
jobs:
discover:
name: Discover hosts

View file

@ -10,6 +10,13 @@ on:
# Requires these repository secrets:
# AGE_SECRET_KEY — age private key for SOPS decryption
# Serialize Terraform runs so two merges can't apply against the state
# concurrently. Never cancel an in-flight run (an interrupted apply can
# corrupt state) — queue instead.
concurrency:
group: terraform-state
cancel-in-progress: false
jobs:
plan:
name: Plan

View file

@ -24,6 +24,10 @@ terraform {
region = "eu-central-003"
skip_credentials_validation = true
skip_region_validation = true
# NOTE: no state locking Backblaze B2's S3 API doesn't implement the
# conditional PutObject that OpenTofu's use_lockfile needs (returns 501
# NotImplemented). Concurrent applies are instead prevented by the
# `concurrency` guard in .github/workflows/terraform.yml.
# Credentials read from AWS_ACCESS_KEY_ID / AWS_SECRET_ACCESS_KEY env vars
}
}