Skip to content

Add stackhpc-zuul merge rights in Ansible,Kayobe and OpenStack repos #530

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mnasiadka merged 1 commit into from
Jun 2, 2026
+48 −24
Merged

Add stackhpc-zuul merge rights in Ansible,Kayobe and OpenStack repos #530

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
53 changes: 34 additions & 19 deletions terraform/github/branches.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,16 @@ resource "github_branch_protection" "ansible_branch_protection" {
required_approving_review_count = 1
}

# Only permit members of the `Developers` team to push to the protected branch. Members
# would still need to get the required approval from reviewers and pass any checks before
# being able to merge. Also this should prevent outsiders from pushing to the protected branch,
# however, whilst they can open a pull request they shoud not be able to merge that would be
# Only permit members of the `Developers` team to push to the protected branch. Members
# would still need to get the required approval from reviewers and pass any checks before
# being able to merge. Also this should prevent outsiders from pushing to the protected branch,
# however, whilst they can open a pull request they shoud not be able to merge that would be
# upto the reviewers or codeowners.
restrict_pushes {
blocks_creations = false
push_allowances = [
resource.github_team.organisation_teams["Developers"].node_id
resource.github_team.organisation_teams["Developers"].node_id,
local.zuul_app_node_id
]
}

Expand Down Expand Up @@ -121,7 +122,8 @@ resource "github_branch_protection" "kayobe_branch_protection_py_3-6" {
restrict_pushes {
blocks_creations = false
push_allowances = [
resource.github_team.organisation_teams["Developers"].node_id
resource.github_team.organisation_teams["Developers"].node_id,
local.zuul_app_node_id
]
}

Expand Down Expand Up @@ -158,7 +160,8 @@ resource "github_branch_protection" "kayobe_branch_protection_zed" {
restrict_pushes {
blocks_creations = false
push_allowances = [
resource.github_team.organisation_teams["Developers"].node_id
resource.github_team.organisation_teams["Developers"].node_id,
local.zuul_app_node_id
]
}

Expand Down Expand Up @@ -196,7 +199,8 @@ resource "github_branch_protection" "kayobe_branch_protection_antelope" {
restrict_pushes {
blocks_creations = false
push_allowances = [
resource.github_team.organisation_teams["Developers"].node_id
resource.github_team.organisation_teams["Developers"].node_id,
local.zuul_app_node_id
]
}

Expand Down Expand Up @@ -234,7 +238,8 @@ resource "github_branch_protection" "kayobe_branch_protection_caracal" {
restrict_pushes {
blocks_creations = false
push_allowances = [
resource.github_team.organisation_teams["Developers"].node_id
resource.github_team.organisation_teams["Developers"].node_id,
local.zuul_app_node_id
]
}

Expand Down Expand Up @@ -271,7 +276,8 @@ resource "github_branch_protection" "kayobe_branch_protection_epoxy" {
restrict_pushes {
blocks_creations = false
push_allowances = [
resource.github_team.organisation_teams["Developers"].node_id
resource.github_team.organisation_teams["Developers"].node_id,
local.zuul_app_node_id
]
}

Expand Down Expand Up @@ -309,7 +315,8 @@ resource "github_branch_protection" "kayobe_branch_protection_gazpacho" {
restrict_pushes {
blocks_creations = false
push_allowances = [
resource.github_team.organisation_teams["Developers"].node_id
resource.github_team.organisation_teams["Developers"].node_id,
local.zuul_app_node_id
]
}

Expand Down Expand Up @@ -346,7 +353,8 @@ resource "github_branch_protection" "kayobe_branch_protection_master" {
restrict_pushes {
blocks_creations = false
push_allowances = [
resource.github_team.organisation_teams["Developers"].node_id
resource.github_team.organisation_teams["Developers"].node_id,
local.zuul_app_node_id
]
}

Expand Down Expand Up @@ -381,7 +389,8 @@ resource "github_branch_protection" "openstack_branch_protection_py_3-6" {
restrict_pushes {
blocks_creations = false
push_allowances = [
resource.github_team.organisation_teams["Developers"].node_id
resource.github_team.organisation_teams["Developers"].node_id,
local.zuul_app_node_id
]
}

Expand Down Expand Up @@ -417,7 +426,8 @@ resource "github_branch_protection" "openstack_branch_protection_zed" {
restrict_pushes {
blocks_creations = false
push_allowances = [
resource.github_team.organisation_teams["Developers"].node_id
resource.github_team.organisation_teams["Developers"].node_id,
local.zuul_app_node_id
]
}

Expand Down Expand Up @@ -455,7 +465,8 @@ resource "github_branch_protection" "openstack_branch_protection_antelope" {
restrict_pushes {
blocks_creations = false
push_allowances = [
resource.github_team.organisation_teams["Developers"].node_id
resource.github_team.organisation_teams["Developers"].node_id,
local.zuul_app_node_id
]
}

Expand Down Expand Up @@ -493,7 +504,8 @@ resource "github_branch_protection" "openstack_branch_protection_caracal" {
restrict_pushes {
blocks_creations = false
push_allowances = [
resource.github_team.organisation_teams["Developers"].node_id
resource.github_team.organisation_teams["Developers"].node_id,
local.zuul_app_node_id
]
}

Expand Down Expand Up @@ -530,7 +542,8 @@ resource "github_branch_protection" "openstack_branch_protection_epoxy" {
restrict_pushes {
blocks_creations = false
push_allowances = [
resource.github_team.organisation_teams["Developers"].node_id
resource.github_team.organisation_teams["Developers"].node_id,
local.zuul_app_node_id
]
}

Expand Down Expand Up @@ -568,7 +581,8 @@ resource "github_branch_protection" "openstack_branch_protection_gazpacho" {
restrict_pushes {
blocks_creations = false
push_allowances = [
resource.github_team.organisation_teams["Developers"].node_id
resource.github_team.organisation_teams["Developers"].node_id,
local.zuul_app_node_id
]
}

Expand Down Expand Up @@ -605,7 +619,8 @@ resource "github_branch_protection" "openstack_branch_protection_master" {
restrict_pushes {
blocks_creations = false
push_allowances = [
resource.github_team.organisation_teams["Developers"].node_id
resource.github_team.organisation_teams["Developers"].node_id,
local.zuul_app_node_id
]
}

Expand Down
19 changes: 14 additions & 5 deletions terraform/github/repositories.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,15 +80,24 @@ resource "github_issue_label" "monitoring_label" {
description = "All things related to observability & telemetry"
}

data "github_repository" "repositories" {
for_each = toset(flatten(values(var.repositories)))
full_name = format("%s/%s", var.owner, each.value)
}

resource "github_issue_label" "workflows_label" {
for_each = toset(flatten(values(var.repositories)))
repository = each.value
name = "workflows"
color = "638475"
description = "Workflow files have been modified"
}

data "github_repository" "repositories" {
for_each = toset(flatten(values(var.repositories)))
full_name = format("%s/%s", var.owner, each.value)
}

data "github_app" "zuul" {
slug = "stackhpc-zuul"
}

locals {
zuul_app_node_id = data.github_app.zuul.node_id
}