qontract-reconcile 0.10.2.dev191__py3-none-any.whl → 0.10.2.dev192__py3-none-any.whl

{qontract_reconcile-0.10.2.dev191.dist-info → qontract_reconcile-0.10.2.dev192.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qontract-reconcile
-Version: 0.10.2.dev191
+Version: 0.10.2.dev192
 Summary: Collection of tools to reconcile services with their desired state as defined in the app-interface DB.
 Project-URL: homepage, https://github.com/app-sre/qontract-reconcile
 Project-URL: repository, https://github.com/app-sre/qontract-reconcile

{qontract_reconcile-0.10.2.dev191.dist-info → qontract_reconcile-0.10.2.dev192.dist-info}/RECORD

@@ -29,7 +29,7 @@ reconcile/github_repo_permissions_validator.py,sha256=PNqL4dqa2OaNBy-NmLVN-t1HZa
 reconcile/github_users.py,sha256=ZeYNMyvZPVMx6mh5TiKEUQy4W1uw3VmUZOHiXus5I0Y,5073
 reconcile/github_validator.py,sha256=-j17tn3csFVjPMSPL3te48iWVkPZCncRXdeKeLdGjjQ,931
 reconcile/gitlab_fork_compliance.py,sha256=RbHckzLnE9zkOFHJANzoejEMMbMAivmqJVs3Suvp9lU,4591
-reconcile/gitlab_housekeeping.py,sha256=c31Jtw5t8bnOzUO9jMWF_0DHitPzol93AA7YWBxM5L0,25416
+reconcile/gitlab_housekeeping.py,sha256=U8DKWsFZe7Q3ArN5WSlrPM8Pxxf2_4V0KgvQAnm1mSQ,25550
 reconcile/gitlab_labeler.py,sha256=BA2dbXsN9hErUwJl22qcxfeH7XiPCuQ9LN3NddWdnpo,4540
 reconcile/gitlab_members.py,sha256=yRZOZqwB9_FJ5DWIFEod6hoG0X38z36atInNshAWddI,8263
 reconcile/gitlab_mr_sqs_consumer.py,sha256=i_MDVfA3Uk_TJiNkfEJzhO6_rwR7z3I3dH9oEw686U4,2681
@@ -809,7 +809,7 @@ tools/saas_promotion_state/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
 tools/saas_promotion_state/saas_promotion_state.py,sha256=UfwwRLS5Ya4_Nh1w5n1dvoYtchQvYE9yj1VANt2IKqI,3925
 tools/sre_checkpoints/__init__.py,sha256=CDaDaywJnmRCLyl_NCcvxi-Zc0hTi_3OdwKiFOyS39I,145
 tools/sre_checkpoints/util.py,sha256=zEDbGr18ZeHNQwW8pUsr2JRjuXIPz--WAGJxZo9sv_Y,894
-qontract_reconcile-0.10.2.dev191.dist-info/METADATA,sha256=hkZlFU724NFRqRqkQbNqid1QOyAl1qh3yc5mEcTG964,24555
-qontract_reconcile-0.10.2.dev191.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-qontract_reconcile-0.10.2.dev191.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
-qontract_reconcile-0.10.2.dev191.dist-info/RECORD,,
+qontract_reconcile-0.10.2.dev192.dist-info/METADATA,sha256=k0G4P25wbsCOkHg4TS0eD_mHgGuihKi2U1BvpwEh8HA,24555
+qontract_reconcile-0.10.2.dev192.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+qontract_reconcile-0.10.2.dev192.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
+qontract_reconcile-0.10.2.dev192.dist-info/RECORD,,

reconcile/gitlab_housekeeping.py

@@ -72,6 +72,7 @@ HOLD_LABELS = [
 QONTRACT_INTEGRATION = "gitlab-housekeeping"
 DATE_FORMAT = "%Y-%m-%dT%H:%M:%S.%fZ"
 EXPIRATION_DATE_FORMAT = "%Y-%m-%d"
+SQUASH_OPTION_ALWAYS = "always"
 
 merged_merge_requests = Counter(
     name="qontract_reconcile_merged_merge_requests",
@@ -613,7 +614,8 @@ def merge_merge_requests(
         logging.info(["merge", gl.project.name, mr.iid])
         if not dry_run and merges < merge_limit:
             try:
-                mr.merge()
+                squash = (gl.project.squash_option == SQUASH_OPTION_ALWAYS) or mr.squash
+                mr.merge(squash=squash)
                 labels = mr.labels
                 merged_merge_requests.labels(
                     project_id=mr.target_project_id,