Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 70 additions & 2 deletions terraform/github/branches.tf
Original file line number Diff line number Diff line change
Expand Up @@ -523,7 +523,7 @@ resource "github_branch_protection" "openstack_branch_protection_caracal" {
}

resource "github_branch_protection" "openstack_branch_protection_epoxy" {
for_each = toset(var.repositories["OpenStack"])
for_each = toset([for r in var.repositories["OpenStack"] : r if !contains(var.repositories["ZuulOnly"], r)])
repository_id = data.github_repository.repositories[each.key].node_id

pattern = "stackhpc/2025.1"
Expand Down Expand Up @@ -562,7 +562,7 @@ resource "github_branch_protection" "openstack_branch_protection_epoxy" {
}

resource "github_branch_protection" "openstack_branch_protection_gazpacho" {
for_each = toset(var.repositories["OpenStack"])
for_each = toset([for r in var.repositories["OpenStack"] : r if !contains(var.repositories["ZuulOnly"], r)])
repository_id = data.github_repository.repositories[each.key].node_id

pattern = "stackhpc/2026.1"
Expand Down Expand Up @@ -637,6 +637,74 @@ resource "github_branch_protection" "openstack_branch_protection_master" {
}
}

# ZuulOnly: push_allowances contains only the Zuul GitHub App, so PRs can only be
# merged by Zuul (typically after the "gate" label enqueues the change into its gate
# pipeline). Neither the Developers team nor the owning team can merge directly.
# Only the stackhpc/2025.1 and stackhpc/2026.1 branches are gated this way for now
resource "github_branch_protection" "zuulonly_branch_protection_epoxy" {
for_each = toset(var.repositories["ZuulOnly"])
repository_id = data.github_repository.repositories[each.key].node_id

pattern = "stackhpc/2025.1"
require_conversation_resolution = true
allows_deletions = false
allows_force_pushes = false

restrict_pushes {
blocks_creations = false
push_allowances = [
local.zuul_app_node_id
]
}

required_pull_request_reviews {
dismiss_stale_reviews = true
require_code_owner_reviews = true
required_approving_review_count = 1
}

required_status_checks {
contexts = ["stackhpc/check"]
strict = false
}

lifecycle {
prevent_destroy = true
}
}

resource "github_branch_protection" "zuulonly_branch_protection_gazpacho" {
for_each = toset(var.repositories["ZuulOnly"])
repository_id = data.github_repository.repositories[each.key].node_id

pattern = "stackhpc/2026.1"
require_conversation_resolution = true
allows_deletions = false
allows_force_pushes = false

restrict_pushes {
blocks_creations = false
push_allowances = [
local.zuul_app_node_id
]
}

required_pull_request_reviews {
dismiss_stale_reviews = true
require_code_owner_reviews = true
required_approving_review_count = 1
}

required_status_checks {
contexts = ["stackhpc/check"]
strict = false
}

lifecycle {
prevent_destroy = true
}
}

resource "github_branch_protection" "platform_branch_protection" {
for_each = toset(var.repositories["Platform"])
repository_id = data.github_repository.repositories[each.key].node_id
Expand Down
3 changes: 3 additions & 0 deletions terraform/github/terraform.tfvars.json
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,9 @@
"stackhpc-inspector-plugins"
],
"Platform": [],
"ZuulOnly": [
"neutron"
],
"ReleaseTrain": [
".github",
"ARC-Installer",
Expand Down
1 change: 1 addition & 0 deletions terraform/github/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ variable "repositories" {
"Platform" = [],
"ReleaseTrain" = [],
"SMSLab" = [],
"ZuulOnly" = [],
}
}

Expand Down
Loading