re-introduce branch protection rules

kyma-project · Jun 19, 2024 · e17615d · e17615d
1 parent e8a66c4
commit e17615d
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/pkg/tools/pjtester/test_artifacts/test-prow-config.yaml b/pkg/tools/pjtester/test_artifacts/test-prow-config.yaml
@@ -240,7 +240,14 @@ branch-protection:
               required_status_checks:
                 strict: true
         reconciler:
-          unmanaged: true
+          protect: false
+          branches:
+            main:
+              protect: true
+            develop:
+              protect: true
+            load-test-mock:
+              protect: true
 
 tide:
   sync_period: 2m
@@ -261,6 +268,7 @@ tide:
     kyma-project/kyma-watcher: squash
     kyma-project/manifest-operator: squash
     kyma-incubator/compass: squash
+    kyma-incubator/reconciler: squash
     kyma-incubator/api-gateway: squash
     kyma-incubator/compass-console: squash
     kyma-incubator/ord-service: squash

diff --git a/prow/config.yaml b/prow/config.yaml
@@ -398,7 +398,16 @@ branch-protection:
                 # Require PR branch to be up-to-date with main
                 strict: true
         reconciler:
-          unmanaged: true
+          protect: false
+          branches:
+            main:
+              protect: true
+            develop:
+              protect: true
+            load-test-mock:
+              protect: true
+            istio-op:
+              protect: true
 
 tide:
   sync_period: 2m
@@ -438,6 +447,7 @@ tide:
     kyma-project/modulectl: squash
     kyma-project/cloud-manager: squash
     kyma-incubator/compass: squash
+    kyma-incubator/reconciler: squash
     kyma-incubator/compass-console: squash
     kyma-incubator/ord-service: squash
     kyma-incubator/kymart: squash