qontract-reconcile 0.10.1rc1079__py3-none-any.whl → 0.10.1rc1081__py3-none-any.whl

{qontract_reconcile-0.10.1rc1079.dist-info → qontract_reconcile-0.10.1rc1081.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qontract-reconcile
-Version: 0.10.1rc1079
+Version: 0.10.1rc1081
 Summary: Collection of tools to reconcile services with their desired state as defined in the app-interface DB.
 Home-page: https://github.com/app-sre/qontract-reconcile
 Author: Red Hat App-SRE Team

{qontract_reconcile-0.10.1rc1079.dist-info → qontract_reconcile-0.10.1rc1081.dist-info}/RECORD

@@ -30,7 +30,7 @@ reconcile/github_repo_permissions_validator.py,sha256=dcbXdUx6imjNchjp3pg9-z1i7l
 reconcile/github_users.py,sha256=nfTq78QRONIfDVj-5O3bD6psllJjzWFnog-EJ1WqFPU,3672
 reconcile/github_validator.py,sha256=cVTVxJIGR4a1Jz8wrdXEAb_CMpXUzvykVmUURX4cook,917
 reconcile/gitlab_fork_compliance.py,sha256=5joAIGOOLhHme1ipa7ZQeQkUOVe3dKbRO1wJtTwyNR4,4178
-reconcile/gitlab_housekeeping.py,sha256=nvClNzehph010hRTIMGDQc-3ag08aBXNUhzEJ2KW22c,22088
+reconcile/gitlab_housekeeping.py,sha256=fgmR_Q-RHchGhYky-Q78f0Wzx4xQ_mk8-0mpDgfFsMI,22193
 reconcile/gitlab_labeler.py,sha256=4xJHmVX155fclrHqkR926sL1GH6RTN5XfZ8PnqNXbRA,4534
 reconcile/gitlab_members.py,sha256=PrJE9OhDRdGG_gHM_77nQojLb4B18jtUu8DxgLsRS88,8417
 reconcile/gitlab_mr_sqs_consumer.py,sha256=O46mdziPgGOndbU-0_UJKJVUaiEoVzJPEgKm4_UvYoI,2571
@@ -452,11 +452,11 @@ reconcile/saas_auto_promotions_manager/merge_request_manager/__init__.py,sha256=
 reconcile/saas_auto_promotions_manager/merge_request_manager/batcher.py,sha256=R2CRtjdOggY5lSqt-A5qz2ymqomx4opVeVV_oqBAW0A,7804
 reconcile/saas_auto_promotions_manager/merge_request_manager/desired_state.py,sha256=isY8frVsL3PlcdZmdZ4O0qyp76oczl4DUMX9uMArs5Y,1222
 reconcile/saas_auto_promotions_manager/merge_request_manager/merge_request.py,sha256=BeAJWLow7b4HQyZ9zz398sQkPeIz8chpMkCts2NU27c,1282
-reconcile/saas_auto_promotions_manager/merge_request_manager/merge_request_manager_v2.py,sha256=-zWK-cqr_8o9ZEnNfD3cfkv3hrrU4HJ4UMzi4J2Hjhw,6223
+reconcile/saas_auto_promotions_manager/merge_request_manager/merge_request_manager_v2.py,sha256=PwL6fLbL9oKvHkxBvRu8rxGd-izeoaVgPQAabsZVjAc,6162
 reconcile/saas_auto_promotions_manager/merge_request_manager/metrics.py,sha256=sdHp71Wl87tFM-Z_QvqvdHhyrppFLGi4ekksCi_e_bs,977
 reconcile/saas_auto_promotions_manager/merge_request_manager/mr_parser.py,sha256=gG4HuQGgZnPC9xtvQzjVYAuWWBWWVYSZpOo50_ebuhg,8620
 reconcile/saas_auto_promotions_manager/merge_request_manager/open_merge_requests.py,sha256=-qGQOh6Jdp4lomNDij3zWVC0pl6uPHFWS5Woqcp5HQk,410
-reconcile/saas_auto_promotions_manager/merge_request_manager/renderer.py,sha256=rnY9CR_0ONDJdJhGaGOQ9yBlKV0bPXQKh9Ped-NA2To,7245
+reconcile/saas_auto_promotions_manager/merge_request_manager/renderer.py,sha256=EgImn9SpeThTNN5-P5lvz__bMKZNU4m2SfKpocRCy5w,7278
 reconcile/saas_auto_promotions_manager/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/saas_auto_promotions_manager/utils/saas_files_inventory.py,sha256=wj7x3DIoetLX5QeaorTH0i8QC5GWsqahbUOrUb0AzJk,8830
 reconcile/skupper_network/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -870,8 +870,8 @@ tools/test/test_qontract_cli.py,sha256=_D61RFGAN5x44CY1tYbouhlGXXABwYfxKSWSQx3Jr
 tools/test/test_saas_promotion_state.py,sha256=dy4kkSSAQ7bC0Xp2CociETGN-2aABEfL6FU5D9Jl00Y,6056
 tools/test/test_sd_app_sre_alert_report.py,sha256=v363r9zM7__0kR5K6mvJoGFcM9BvE33fWAayrqkpojA,2116
 tools/test/test_sre_checkpoints.py,sha256=SKqPPTl9ua0RFdSSofnoQX-JZE6dFLO3LRhfQzqtfh8,2607
-qontract_reconcile-0.10.1rc1079.dist-info/METADATA,sha256=DXIyJxZvXSTDEpfJMVm9-gHPlcs369V7T2STe6DHG9s,2213
-qontract_reconcile-0.10.1rc1079.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-qontract_reconcile-0.10.1rc1079.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc1079.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc1079.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc1081.dist-info/METADATA,sha256=xxeBSBnT__JesEHsX9pDdvbfczlA74Szbn7AMZfG6SU,2213
+qontract_reconcile-0.10.1rc1081.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+qontract_reconcile-0.10.1rc1081.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc1081.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc1081.dist-info/RECORD,,

reconcile/gitlab_housekeeping.py

@@ -47,6 +47,7 @@ from reconcile.utils.mr.labels import (
     SELF_SERVICEABLE,
     prioritized_approval_label,
 )
+from reconcile.utils.sharding import is_in_shard
 
 MERGE_LABELS_PRIORITY = [
     prioritized_approval_label(p.value) for p in ChangeTypePriority
@@ -573,6 +574,7 @@ def run(dry_run, wait_for_pipeline):
     with GitLabApi(instance, settings=settings) as gl:
         publish_access_token_expiration_metrics(gl)
     repos = queries.get_repos_gitlab_housekeeping(server=instance["url"])
+    repos = [r for r in repos if is_in_shard(r["url"])]
     app_sre_usernames: Set[str] = set()
 
     for repo in repos:

reconcile/saas_auto_promotions_manager/merge_request_manager/merge_request_manager_v2.py

@@ -30,13 +30,12 @@ from reconcile.saas_auto_promotions_manager.merge_request_manager.renderer impor
 )
 from reconcile.saas_auto_promotions_manager.subscriber import Subscriber
 from reconcile.utils import metrics
-from reconcile.utils.mr.labels import AUTO_MERGE
 from reconcile.utils.vcs import VCS
 
 BATCH_SIZE_LIMIT = 5
 
 SAPM_LABEL = "SAPM"
-SAPM_MR_LABELS = [SAPM_LABEL, AUTO_MERGE]
+SAPM_MR_LABELS = [SAPM_LABEL]
 
 MR_DESC = """
 This is an auto-promotion triggered by app-interface's [saas-auto-promotions-manager](https://github.com/app-sre/qontract-reconcile/tree/master/reconcile/saas_auto_promotions_manager) (SAPM).

reconcile/saas_auto_promotions_manager/merge_request_manager/renderer.py

@@ -145,6 +145,10 @@ class Renderer:
 {MR_KIND_REF}: {MRKind.BATCHER.value}
 
 {VERSION_REF}: {SAPM_VERSION}
+
+This MR is auto-approved
+
+/lgtm
         """
 
     def render_title(