Skip to content

Remove branch protection for vwx releases #532

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
Alex-Welsh merged 1 commit into from
Jun 4, 2026
+6 −14
Merged

Remove branch protection for vwx releases #532

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
16 changes: 4 additions & 12 deletions terraform/github/branches.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,11 +104,7 @@ resource "github_branch_protection" "kayobe_branch_protection_py_3-6" {
for_each = toset(var.repositories["Kayobe"])
repository_id = data.github_repository.repositories[each.key].node_id

# NOTE(Alex-Welsh): The pattern here is not ideal but it is difficult to
# achieve more precision with the matching tools that GitHub provides.
# https://stackoverflow.com/questions/53135414/how-to-apply-one-github-branch-rule-to-multiple-branches
# Remember to update import_resources.py!
pattern = "stackhpc/[vwxy]*"
pattern = "stackhpc/yoga"
Comment thread
priteau marked this conversation as resolved.
require_conversation_resolution = true
allows_deletions = false
allows_force_pushes = false
Expand All @@ -128,7 +124,7 @@ resource "github_branch_protection" "kayobe_branch_protection_py_3-6" {
}

required_status_checks {
contexts = lookup(lookup(var.required_status_checks, each.key, {}), "stackhpc/[vwxy]*", lookup(var.required_status_checks, each.key, {
contexts = lookup(lookup(var.required_status_checks, each.key, {}), "stackhpc/yoga", lookup(var.required_status_checks, each.key, {
"default" : [
"tox / Tox pep8 with Python 3.8",
"tox / Tox py3 with Python 3.8"
Expand Down Expand Up @@ -377,11 +373,7 @@ resource "github_branch_protection" "openstack_branch_protection_py_3-6" {
for_each = toset(var.repositories["OpenStack"])
repository_id = data.github_repository.repositories[each.key].node_id

# NOTE(Alex-Welsh): The pattern here is not ideal but it is difficult to
# achieve more precision with the matching tools that GitHub provides.
# https://stackoverflow.com/questions/53135414/how-to-apply-one-github-branch-rule-to-multiple-branches
# Remember to update import_resources.py!
pattern = "stackhpc/[vwxy]*"
pattern = "stackhpc/yoga"
Comment thread
priteau marked this conversation as resolved.
require_conversation_resolution = true
allows_deletions = false
allows_force_pushes = false
Expand All @@ -401,7 +393,7 @@ resource "github_branch_protection" "openstack_branch_protection_py_3-6" {
}

required_status_checks {
contexts = lookup(lookup(var.required_status_checks, each.key, {}), "stackhpc/[vwxy]*", lookup(var.required_status_checks, each.key, {
contexts = lookup(lookup(var.required_status_checks, each.key, {}), "stackhpc/yoga", lookup(var.required_status_checks, each.key, {
"default" : [
"tox / Tox pep8 with Python 3.8",
"tox / Tox py3 with Python 3.8"
Expand Down
2 changes: 1 addition & 1 deletion terraform/github/import_resources.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ def main() -> None:
if team_id == TeamID.KAYOBE or team_id == TeamID.OPENSTACK:
# Pre-Zed branch protection
branch_protection_resource = BranchProtection(team_id.name.lower(
), {f"{name}:stackhpc/[vwxy]*": name for name in team_repositories}, parsed_args.dry_run, "_py_3-6")
), {f"{name}:stackhpc/yoga": name for name in team_repositories}, parsed_args.dry_run, "_py_3-6")
branch_protection_resource.refresh_resource()
# Zed branch protection
branch_protection_resource = BranchProtection(team_id.name.lower(
Expand Down
2 changes: 1 addition & 1 deletion terraform/github/terraform.tfvars.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@
"aio (Ubuntu Jammy OVN) / All in one",
"aio upgrade (Rocky 9 OVN) / All in one"
],
"stackhpc/[vwxy]*": [
"stackhpc/yoga": [
"Tox pep8 with Python 3.8",
"Tox releasenotes with Python 3.8",
"Build Kayobe Image / Build kayobe image",
Expand Down