[PTFE-583] ✨ Prevent creation of integration branches

Author: gaspardmoindrot

bert_e/templates/request_integration_branches.md

@@ -12,4 +12,8 @@ To request integration branches, please comment on this pull request with the fo
 ```
 /create_integration_branches
 ```
+
+Alternatively, there's another way to accomplish this. Simply tag this PR with `/approve` or
+`/create_pull_requests`, and it will automatically create the integration branches
+
 {% endblock %}

bert_e/tests/test_bert_e.py

@@ -1182,6 +1182,7 @@ def test_request_integration_branch_creation(self):
 required_leader_approvals: 0
 required_peer_approvals: 1
 always_create_integration_branches: false
+always_create_integration_pull_requests: false
 admins:
   - {admin}
 """ # noqa
@@ -1285,65 +1286,41 @@ def test_creation_integration_branch_by_approve(self):
 admins:
   - {admin}
 """ # noqa
-        options = self.bypass_all_but(['bypass_build_status', 'bypass_author_approval'])
-        pr = self.create_pr('feature/TEST-0069', 'development/4.3')
-
-        with self.assertRaises(exns.ApprovalRequired):
-            self.handle(pr.id, options=options, backtrace=True)
-
-        self.assertEqual(len(list(pr.get_comments())), 3)
-
-        self.assertIn(
-            'Integration data created', list(pr.get_comments())[-2].text)
-
-        self.assertIn(
-            'Waiting for approval', self.get_last_pr_comment(pr))
-        self.assertIn(
-            'The following approvals are needed', self.get_last_pr_comment(pr))
-
-        pr.approve()
-
-        with self.assertRaises(exns.BuildNotStarted):
-            self.handle(
-                pr.id, settings=settings, options=options, backtrace=True)
-
-        options = self.bypass_all
-        with self.assertRaises(exns.SuccessMessage):
-            self.handle(
-                pr.id, settings=settings, options=options, backtrace=True)
-        
-        self.assertIn(
-            'I have successfully merged the changeset', self.get_last_pr_comment(pr))
-
-        options = self.bypass_all_but(['bypass_build_status', 'bypass_author_approval'])
-        pr = self.create_pr('feature/TEST-0070', 'development/4.3')
+        pr_1 = self.create_pr('feature/TEST-0069', 'development/4.3')
+        pr_2 = self.create_pr('feature/TEST-0070', 'development/4.3')
+        prs = [pr_1, pr_2]
 
-        with self.assertRaises(exns.ApprovalRequired):
-            self.handle(pr.id, options=options, backtrace=True)
+        for pr in prs:
+            options = self.bypass_all_but(['bypass_build_status', 'bypass_author_approval'])
+            with self.assertRaises(exns.ApprovalRequired):
+                self.handle(pr.id, options=options, backtrace=True)
 
-        self.assertEqual(len(list(pr.get_comments())), 3)
+            self.assertEqual(len(list(pr.get_comments())), 3)
 
-        self.assertIn(
+            self.assertIn(
             'Integration data created', list(pr.get_comments())[-2].text)
 
-        self.assertIn(
-            'Waiting for approval', self.get_last_pr_comment(pr))
-        self.assertIn(
-            'The following approvals are needed', self.get_last_pr_comment(pr))
+            self.assertIn(
+                'Waiting for approval', self.get_last_pr_comment(pr))
+            self.assertIn(
+                'The following approvals are needed', self.get_last_pr_comment(pr))
 
-        pr.add_comment('/approve')
+            if pr.src_branch == "feature/TEST-0069":
+                pr.approve()
+            elif pr.src_branch == "feature/TEST-0070":
+                pr.add_comment('/approve')
 
-        with self.assertRaises(exns.BuildNotStarted):
-            self.handle(
-                pr.id, settings=settings, options=options, backtrace=True)
+            with self.assertRaises(exns.BuildNotStarted):
+                self.handle(
+                    pr.id, settings=settings, options=options, backtrace=True)
 
-        options = self.bypass_all
-        with self.assertRaises(exns.SuccessMessage):
-            self.handle(
-                pr.id, settings=settings, options=options, backtrace=True)
-        
-        self.assertIn(
-            'I have successfully merged the changeset', self.get_last_pr_comment(pr))
+            options = self.bypass_all
+            with self.assertRaises(exns.SuccessMessage):
+                self.handle(
+                    pr.id, settings=settings, options=options, backtrace=True)
+            
+            self.assertIn(
+                'I have successfully merged the changeset', self.get_last_pr_comment(pr))
 
     def test_integration_branch_creation_latest_branch(self):
         """Test there is no comment to request integration branches creation.

bert_e/workflow/gitwaterflow/integration.py

@@ -144,15 +144,13 @@ def check_integration_branches(job):
         approvals.add(job.pull_request.author)
     approved_by_author = job.pull_request.author in approvals
 
-    always_create_integration = job.settings.always_create_integration_branches
-    create_integration = job.settings.create_integration_branches
-    always_create_integration_prs = job.settings.always_create_integration_pull_requests
-    create_prs = job.settings.create_pull_requests
+    create_integration = (job.settings.always_create_integration_branches or
+        job.settings.create_integration_branches)
+    create_prs = (job.settings.always_create_integration_pull_requests or
+        job.settings.create_pull_requests)
     multiple_dst_branches = len(job.git.cascade.dst_branches) <= 1
 
-    if not (always_create_integration
-            or create_integration
-            or always_create_integration_prs
+    if not (create_integration
             or create_prs
             or approved_by_author
             or multiple_dst_branches):