From 770f9bc928c880c467c8e29d275baa392a340db8 Mon Sep 17 00:00:00 2001 From: Elior Erez Date: Sat, 17 Oct 2026 15:57:11 -0400 Subject: [PATCH] NO-ISSUE: Require CI and jira-reference on osac-test-infra (step A) First step of moving osac-test-infra pull requests to the native flow that osac uses: one approval that a push dismisses, and the required checks CI and jira-reference. The old gates (e2e-*-gate, check-labels, pre-commit) are replaced by the CI check of the new ci.yml. Apply together with the osac-test-infra change that adds ci.yml, in the switch window; the E2E check follows as step B. Signed-off-by: Elior Erez --- repositories.tf | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/repositories.tf b/repositories.tf index 24744aa..37f3210 100644 --- a/repositories.tf +++ b/repositories.tf @@ -326,16 +326,17 @@ module "repo_osac_test_infra" { permission = github_organization_repository_role.ci_maintainer.name } ] - required_approvals = null + # Native GitHub review, as in osac: one approval, dropped when a new commit is pushed. Step A of the move to the shared + # flow of osac-ci: the two cheap checks. `CI` (ci.yml) sums up pre-commit and the script tests; `jira-reference` says the + # title names a Jira issue or NO-ISSUE. The E2E check is added in step B, once the suites have run for real. + # Both are posted by GitHub Actions. The old gates (e2e-*-gate, check-labels, pre-commit) are no longer produced. + allow_update_branch = true + required_approvals = 1 + dismiss_stale_reviews = true + required_status_checks = [ - { context = "e2e-vmaas-gate", integration_id = 15368 }, - { context = "e2e-bmaas-gate", integration_id = 15368 }, - { context = "e2e-caas-gate", integration_id = 15368 }, - { context = "check-labels", integration_id = 15368 }, - # Job name in osac-test-infra/.github/workflows/pre-commit.yaml. - # That workflow must listen to merge_group or the queue waits - # check_response_timeout_minutes for a check that never reports. - { context = "pre-commit", integration_id = 15368 }, + { context = "CI", integration_id = 15368 }, + { context = "jira-reference", integration_id = 15368 }, ] ruleset_bypass_team_ids = [ github_team.all["managers"].id,