manifest-integration.yml

@@ -120,6 +120,8 @@ cancel-previous-pipelines:
     - .infrastructure
     - .skip-for-gitlab-ci-integrations
   stage: manifest-integration
+  rules:
+    - if: $CI_MERGE_REQUEST_IID
   allow_failure: true
   script:
     - .gitlab-ci/scripts/cancel_pipelines.py

scripts/accept_merge_request.py

@@ -83,7 +83,7 @@ def accept_merge_request(project, mr, rebase=False, should_remove_source_branch=
                     print("Merge not possible for unkown reason")
                     return False, mr.sha
 
-            elif e.response_code == 406:
+            elif e.response_code == 422:
                 # Merge conflict, automatic rebase is possible
                 if pipeline_pending:
                     print("")