Drop rebase for now

CCExtractor · Dec 15, 2016 · eade2d5 · eade2d5
1 parent c283ffc
commit eade2d5
Showing 1 changed file with 26 additions and 26 deletions.
diff --git a/mod_ci/controllers.py b/mod_ci/controllers.py
@@ -262,32 +262,32 @@ def kvm_processor(db, kvm_name, platform, repository, delay):
         # Check out branch
         test_branch.checkout(True)
         # Rebase on master
-        try:
-            repo.git.rebase('master')
-        except GitCommandError:
-            progress = TestProgress(
-                test.id, TestStatus.preparation, 
-                'Rebase on master'
-            )
-            db.add(progress)
-            progress = TestProgress(
-                test.id, TestStatus.canceled, 
-                'Merge conflict, please resolve.'
-            )
-            db.add(progress)
-            db.commit()
-            # Report back
-            gh_commit = repository.statuses(test.commit)
-
-            with app.app_context():
-                target_url = url_for(
-                    'test.by_id', test_id=test.id, _external=True)
-            context = "CI - %s" % test.platform.value
-            gh_commit.post(
-                state=Status.ERROR, description='Failed to rebase',
-                context=context, target_url=target_url)
-            # Return, so next one can be handled
-            return
+        # try:
+        #     repo.git.rebase('master')
+        # except GitCommandError:
+        #     progress = TestProgress(
+        #         test.id, TestStatus.preparation,
+        #         'Rebase on master'
+        #     )
+        #     db.add(progress)
+        #     progress = TestProgress(
+        #         test.id, TestStatus.canceled,
+        #         'Merge conflict, please resolve.'
+        #     )
+        #     db.add(progress)
+        #     db.commit()
+        #     # Report back
+        #     gh_commit = repository.statuses(test.commit)
+        #
+        #     with app.app_context():
+        #         target_url = url_for(
+        #             'test.by_id', test_id=test.id, _external=True)
+        #     context = "CI - %s" % test.platform.value
+        #     gh_commit.post(
+        #         state=Status.ERROR, description='Failed to rebase',
+        #         context=context, target_url=target_url)
+        #     # Return, so next one can be handled
+        #     return
         # TODO: check what happens on merge conflicts
     else:
         test_branch = repo.create_head('CI_Branch', 'HEAD')