From ad5192dda7c15d3e328bd232082ebde46a5d07e2 Mon Sep 17 00:00:00 2001 From: Elior Erez Date: Mon, 22 Jun 2026 12:46:37 -0400 Subject: [PATCH 1/2] OSAC-1675: Add e2e-test environment to component repos Add the e2e-test GitHub environment to fulfillment-service, osac-operator, osac-aap, and osac-installer. This gates fork PRs from accessing self-hosted runners via environment protection rules. --- repositories.tf | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/repositories.tf b/repositories.tf index 0d9b2ed..9409680 100644 --- a/repositories.tf +++ b/repositories.tf @@ -106,7 +106,12 @@ module "repo_fulfillment_service" { } ] required_approvals = null - push_allowances = ["/openshift-merge-robot", "osac-project/wg-infra", "osac-project/org-admins"] + required_status_checks = [ + "ci/prow/unit", + "e2e-full-install / e2e" + ] + push_allowances = ["/openshift-merge-robot", "osac-project/wg-infra", "osac-project/org-admins"] + environments = [{ name = "e2e-test" }] pages = { build_type = "workflow" source = { @@ -132,7 +137,12 @@ module "repo_cloudkit_operator" { } ] required_approvals = null - push_allowances = ["/openshift-merge-robot", "osac-project/wg-infra", "osac-project/org-admins"] + required_status_checks = [ + "ci/prow/temp", + "e2e-full-install / e2e" + ] + push_allowances = ["/openshift-merge-robot", "osac-project/wg-infra", "osac-project/org-admins"] + environments = [{ name = "e2e-test" }] } module "repo_cloudkit_aap" { @@ -151,7 +161,12 @@ module "repo_cloudkit_aap" { } ] required_approvals = null - push_allowances = ["/openshift-merge-robot", "osac-project/wg-infra", "osac-project/org-admins"] + required_status_checks = [ + "ci/prow/temp", + "e2e-full-install / e2e" + ] + push_allowances = ["/openshift-merge-robot", "osac-project/wg-infra", "osac-project/org-admins"] + environments = [{ name = "e2e-test" }] } module "repo_cloudkit_aap_ee" { From 812df6aac549fd6d3483b48ac27a7297630a05e2 Mon Sep 17 00:00:00 2001 From: Elior Erez Date: Mon, 29 Jun 2026 23:22:56 -0400 Subject: [PATCH 2/2] OSAC-1675: Update required_status_checks for e2e job key rename Rename required check from "e2e-full-install / e2e" to "e2e-vmaas-full-install / e2e" for fulfillment-service, osac-operator, osac-aap, and osac-installer. This matches the job key rename in each repo's caller workflow. --- repositories.tf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/repositories.tf b/repositories.tf index 9409680..b15cae3 100644 --- a/repositories.tf +++ b/repositories.tf @@ -108,7 +108,7 @@ module "repo_fulfillment_service" { required_approvals = null required_status_checks = [ "ci/prow/unit", - "e2e-full-install / e2e" + "e2e-vmaas-full-install / e2e" ] push_allowances = ["/openshift-merge-robot", "osac-project/wg-infra", "osac-project/org-admins"] environments = [{ name = "e2e-test" }] @@ -139,7 +139,7 @@ module "repo_cloudkit_operator" { required_approvals = null required_status_checks = [ "ci/prow/temp", - "e2e-full-install / e2e" + "e2e-vmaas-full-install / e2e" ] push_allowances = ["/openshift-merge-robot", "osac-project/wg-infra", "osac-project/org-admins"] environments = [{ name = "e2e-test" }] @@ -163,7 +163,7 @@ module "repo_cloudkit_aap" { required_approvals = null required_status_checks = [ "ci/prow/temp", - "e2e-full-install / e2e" + "e2e-vmaas-full-install / e2e" ] push_allowances = ["/openshift-merge-robot", "osac-project/wg-infra", "osac-project/org-admins"] environments = [{ name = "e2e-test" }] @@ -212,7 +212,7 @@ module "repo_osac_installer" { ] required_status_checks = [ - "e2e-full-install / e2e" + "e2e-vmaas-full-install / e2e" ] required_approvals = null